vlc | branch: master | Rémi Denis-Courmont <r...@remlab.net> | Sun Mar 25 18:42:44 2012 +0300| [591633b76ae00810185c818fa4aaee7257291e9d] | committer: Rémi Denis-Courmont
m3u8: validate UTF-8 input > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=591633b76ae00810185c818fa4aaee7257291e9d --- modules/demux/playlist/m3u.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/modules/demux/playlist/m3u.c b/modules/demux/playlist/m3u.c index 5c34aa3..bb6a88c 100644 --- a/modules/demux/playlist/m3u.c +++ b/modules/demux/playlist/m3u.c @@ -55,6 +55,11 @@ static char *GuessEncoding (const char *str) return IsUTF8 (str) ? strdup (str) : FromLatin1 (str); } +static char *CheckUnicode (const char *str) +{ + return IsUTF8 (str) ? strdup (str): NULL; +} + /***************************************************************************** * Import_M3U: main import function *****************************************************************************/ @@ -68,7 +73,7 @@ int Import_M3U( vlc_object_t *p_this ) if( POKE( p_peek, "RTSPtext", 8 ) /* QuickTime */ || demux_IsPathExtension( p_demux, ".m3u8" ) || demux_IsForced( p_demux, "m3u8" ) ) - pf_dup = strdup; /* UTF-8 */ + pf_dup = CheckUnicode; /* UTF-8 */ else if( POKE( p_peek, "#EXTM3U", 7 ) || demux_IsPathExtension( p_demux, ".m3u" ) _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits