summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-03 01:41:48 +0000
committereugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-03 01:41:48 +0000
commit452d1d6c61734706703a1d59f276403da0c0774d (patch)
tree47cdd88bf88dc4b798d5a596647ebc43f2b6a36a
parent1547c311744a00a58e2dd3235fb7ba9e08da7c11 (diff)
downloadmpv-452d1d6c61734706703a1d59f276403da0c0774d.tar.bz2
mpv-452d1d6c61734706703a1d59f276403da0c0774d.tar.xz
Bugfix: sub_recode could deallocate global sub_cp under some circumstances.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20618 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libass/ass.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libass/ass.c b/libass/ass.c
index f55675bb05..81aff429dc 100644
--- a/libass/ass.c
+++ b/libass/ass.c
@@ -805,7 +805,7 @@ static char* sub_recode(char* data, size_t size, char* codepage)
assert(codepage);
{
- char* cp_tmp = codepage;
+ char* cp_tmp = codepage ? strdup(codepage) : 0;
#ifdef HAVE_ENCA
char enca_lang[3], enca_fallback[100];
if (sscanf(codepage, "enca:%2s:%99s", enca_lang, enca_fallback) == 2