From 90aa6fc5e9e425c6eb6f519224f2b7e868911d36 Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Fri, 1 Aug 2008 01:01:39 +0200 Subject: [PATCH] http access: Use EnsureUTF8() on the ICY strings. Avoids "illegal byte sequence" warnings and the like such as in #1772 --- modules/access/http.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/access/http.c b/modules/access/http.c index 4d2fd32122..eaa703576e 100644 --- a/modules/access/http.c +++ b/modules/access/http.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -828,7 +829,7 @@ static int ReadICYMeta( access_t *p_access ) strcmp( p_sys->psz_icy_title, &p[1] ) ) { free( p_sys->psz_icy_title ); - p_sys->psz_icy_title = strdup( &p[1] ); + p_sys->psz_icy_title = EnsureUTF8( strdup( &p[1] )); p_access->info.i_update |= INPUT_UPDATE_META; msg_Dbg( p_access, "New Title=%s", p_sys->psz_icy_title ); @@ -1413,7 +1414,7 @@ static int Request( access_t *p_access, int64_t i_tell ) else if( !strcasecmp( psz, "Icy-Name" ) ) { free( p_sys->psz_icy_name ); - p_sys->psz_icy_name = strdup( p ); + p_sys->psz_icy_name = EnsureUTF8( strdup( p )); msg_Dbg( p_access, "Icy-Name: %s", p_sys->psz_icy_name ); p_sys->b_icecast = true; /* be on the safeside. set it here as well. */ @@ -1423,7 +1424,7 @@ static int Request( access_t *p_access, int64_t i_tell ) else if( !strcasecmp( psz, "Icy-Genre" ) ) { free( p_sys->psz_icy_genre ); - p_sys->psz_icy_genre = strdup( p ); + p_sys->psz_icy_genre = EnsureUTF8( strdup( p )); msg_Dbg( p_access, "Icy-Genre: %s", p_sys->psz_icy_genre ); } else if( !strncasecmp( psz, "Icy-Notice", 10 ) ) -- 2.39.2