[vlc-commits] http: XML-decode Icy meta infos (fixes #12739)

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Nov  9 20:10:03 2014 +0200| [55c014dbb275efdf38075393cb67002f611961da] | committer: Jean-Baptiste Kempf

http: XML-decode Icy meta infos (fixes #12739)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 79e5fa67e941bdf654aaf2540a35c865d2c9188d)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=55c014dbb275efdf38075393cb67002f611961da
---

 modules/access/http.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/access/http.c b/modules/access/http.c
index 78a186c..65fee24 100644
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -1459,6 +1459,8 @@ static int Request( access_t *p_access, uint64_t i_tell )
             p_sys->psz_icy_name = EnsureUTF8( psz_tmp );
             if( !p_sys->psz_icy_name )
                 free( psz_tmp );
+            else
+                resolve_xml_special_chars( p_sys->psz_icy_name );
             msg_Dbg( p_access, "Icy-Name: %s", p_sys->psz_icy_name );
             input_thread_t *p_input = access_GetParentInput( p_access );
             if ( p_input )
@@ -1480,6 +1482,8 @@ static int Request( access_t *p_access, uint64_t i_tell )
             p_sys->psz_icy_genre = EnsureUTF8( psz_tmp );
             if( !p_sys->psz_icy_genre )
                 free( psz_tmp );
+            else
+                resolve_xml_special_chars( p_sys->psz_icy_genre );
             msg_Dbg( p_access, "Icy-Genre: %s", p_sys->psz_icy_genre );
             input_thread_t *p_input = access_GetParentInput( p_access );
             if( p_input )