summaryrefslogtreecommitdiff
path: root/apps/metadata/mp3.c
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2009-07-14 13:57:45 +0000
committerNils Wallménius <nils@rockbox.org>2009-07-14 13:57:45 +0000
commit3d4701a6e41616cf581a297bab1451cf2db70249 (patch)
treef845837c96ffbed7d59ddf8308f3b3e7c40cb8c9 /apps/metadata/mp3.c
parentc2900a1bacd5d98b57a0d15ea2add1bc08764057 (diff)
downloadrockbox-3d4701a6e41616cf581a297bab1451cf2db70249.tar.gz
rockbox-3d4701a6e41616cf581a297bab1451cf2db70249.zip
FS#10080
* Move strncpy() from core to the pluginlib * Introduce strlcpy() and use that instead in most places (use memcpy in a few) in core and some plugins * Drop strncpy() from the codec api as no codec used it * Bump codec and plugin api versions git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21863 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/metadata/mp3.c')
-rw-r--r--apps/metadata/mp3.c5
1 files changed, 2 insertions, 3 deletions
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);