RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-23 23:32:26 +00:00
Code Issues Releases Wiki Activity

charset_conv: fix memory corruption in mp_iconv_to_utf8

Browse Source 
If mp_iconv_to_utf8 was given an empty string to convert in the buf
parameter it would corrupt memory when writing a null into outbuf
before returning it to the caller. This happened when streaming from a
URL that ends in a slash. For such a URL the method mp_basename returns
an empty string. The method append_dir_subtitles passes the result
returned from mp_basename to mp_iconv_to_utf8 which then corrupts
memory. This was detected using Guard Malloc. The fix changes
mp_iconv_to_utf8 check up front if buf is empty and if it is return
buf as the result in compliance with the documented behavior of the
method when no conversion is needed.

Fixes #11626
This commit is contained in:
low-batt 2023-04-24 21:56:38 -04:00 committed by Dudemanguy
parent e928bd5fdb
commit 6d208d38d2
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
misc/charset_conv.c
View File

@ -161,6 +161,9 @@ const char *mp_charset_guess(void *talloc_ctx, struct mp_log *log, bstr buf,
bstr mp_iconv_to_utf8(struct mp_log *log, bstr buf, const char *cp, int flags) bstr mp_iconv_to_utf8(struct mp_log *log, bstr buf, const char *cp, int flags)
{ {
#if HAVE_ICONV #if HAVE_ICONV
if (!buf.len)
return buf;
if (!cp || !cp[0] || mp_charset_is_utf8(cp)) if (!cp || !cp[0] || mp_charset_is_utf8(cp))
return buf; return buf;