diff options
Diffstat (limited to 'apps/metadata')
-rw-r--r-- | apps/metadata/metadata_common.c | 5 | ||||
-rw-r--r-- | apps/metadata/mp3.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/apps/metadata/metadata_common.c b/apps/metadata/metadata_common.c index 38761e3dae..5947098f12 100644 --- a/apps/metadata/metadata_common.c +++ b/apps/metadata/metadata_common.c | |||
@@ -320,10 +320,9 @@ long parse_tag(const char* name, char* value, struct mp3entry* id3, | |||
320 | 320 | ||
321 | if (len > 0) | 321 | if (len > 0) |
322 | { | 322 | { |
323 | strncpy(buf, value, len); | ||
324 | buf[len] = 0; | ||
325 | *p = buf; | ||
326 | len++; | 323 | len++; |
324 | strlcpy(buf, value, len); | ||
325 | *p = buf; | ||
327 | } | 326 | } |
328 | else | 327 | else |
329 | { | 328 | { |
diff --git a/apps/metadata/mp3.c b/apps/metadata/mp3.c index d3adc5d6ae..f02700055a 100644 --- a/apps/metadata/mp3.c +++ b/apps/metadata/mp3.c | |||
@@ -309,8 +309,7 @@ static int parseuser( struct mp3entry* entry, char* tag, int bufferpos ) | |||
309 | value_len = bufferpos - (tag - entry->id3v2buf); | 309 | value_len = bufferpos - (tag - entry->id3v2buf); |
310 | 310 | ||
311 | if (!strcasecmp(tag, "ALBUM ARTIST")) { | 311 | if (!strcasecmp(tag, "ALBUM ARTIST")) { |
312 | strncpy(tag, value, value_len); | 312 | strlcpy(tag, value, value_len); |
313 | tag[value_len - 1] = 0; | ||
314 | entry->albumartist = tag; | 313 | entry->albumartist = tag; |
315 | #if CONFIG_CODEC == SWCODEC | 314 | #if CONFIG_CODEC == SWCODEC |
316 | } else { | 315 | } else { |
@@ -1114,7 +1113,7 @@ bool get_mp3_metadata(int fd, struct mp3entry *entry, const char *filename) | |||
1114 | memset(entry, 0, sizeof(struct mp3entry)); | 1113 | memset(entry, 0, sizeof(struct mp3entry)); |
1115 | #endif | 1114 | #endif |
1116 | 1115 | ||
1117 | strncpy(entry->path, filename, sizeof(entry->path)); | 1116 | strlcpy(entry->path, filename, sizeof(entry->path)); |
1118 | 1117 | ||
1119 | entry->title = NULL; | 1118 | entry->title = NULL; |
1120 | entry->filesize = filesize(fd); | 1119 | entry->filesize = filesize(fd); |