From 55e297674f35a90ea9f2deeda2267e8520f1f414 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 29 Aug 2008 09:39:01 +0200 Subject: tag: pass length to fix_utf8() Same as the previous patch, prepare the function fix_utf8() this time. --- src/tag.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/tag.c') diff --git a/src/tag.c b/src/tag.c index b93456641..7bbf27135 100644 --- a/src/tag.c +++ b/src/tag.c @@ -347,17 +347,18 @@ int tag_equal(struct mpd_tag *tag1, struct mpd_tag *tag2) return 1; } -static inline char *fix_utf8(char *str) { +static inline char *fix_utf8(char *str, size_t *length_r) { char *temp; assert(str != NULL); - if (validUtf8String(str, strlen(str))) + if (validUtf8String(str, *length_r)) return str; DEBUG("not valid utf8 in tag: %s\n",str); temp = latin1StrToUtf8Dup(str); free(str); + *length_r = strlen(temp); return temp; } @@ -370,7 +371,7 @@ static void appendToTagItems(struct mpd_tag *tag, enum tag_type type, memcpy(duplicated, value, len); duplicated[len] = '\0'; - duplicated = fix_utf8(duplicated); + duplicated = fix_utf8(duplicated, &len); stripReturnChar(duplicated); tag->numOfItems++; -- cgit v1.2.3