aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2005-04-30 01:50:29 +0000
committerWarren Dukes <warren.dukes@gmail.com>2005-04-30 01:50:29 +0000
commita97110661c26049d73f2fa6fe2f80372fb047ee4 (patch)
treee13237f4d05a8200eef2daf8aca1b3b9248389e3 /src
parentead82e4d5ab80f466bca2dc0c5406d2b56cf00bd (diff)
downloadmpd-a97110661c26049d73f2fa6fe2f80372fb047ee4.tar.gz
mpd-a97110661c26049d73f2fa6fe2f80372fb047ee4.tar.xz
mpd-a97110661c26049d73f2fa6fe2f80372fb047ee4.zip
fix bug 421: database read failed with newline in ID3-tag
git-svn-id: https://svn.musicpd.org/mpd/trunk@3231 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src')
-rw-r--r--src/tag.c2
-rw-r--r--src/utils.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tag.c b/src/tag.c
index 96dbb40f3..2d74c5c81 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -430,13 +430,13 @@ inline static void appendToTagItems(MpdTag * tag, int type, char * value,
dup[len] = '\0';
fixUtf8(dup);
+ stripReturnChar(dup);
tag->numOfItems++;
tag->items = realloc(tag->items, tag->numOfItems*sizeof(MpdTagItem));
tag->items[i].type = type;
tag->items[i].value = getTagItemString(type, dup);
- //tag->items[i].value = strdup(dup);
free(dup);
}
diff --git a/src/utils.c b/src/utils.c
index 32b079353..f3d0effb0 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -48,7 +48,7 @@ char * strDupToUpper(char * str) {
}
void stripReturnChar(char * string) {
- while(string && (string = strstr(string,"\n"))) {
+ while(string && (string = strchr(string,'\n'))) {
*string = ' ';
}
}