From: Rémi Denis-Courmont <remi@remlab.net>
Date: Wed, 1 Sep 2010 03:38:11 +0000 (+0300)
Subject: subsdec: NULL dereference (fix #4125)
X-Git-Tag: 1.2.0-pre1~5339
X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=958cd0365898ef0db3f1e8a42ef13a9f46e31e3e

subsdec: NULL dereference (fix #4125)
---

diff --git a/modules/codec/subtitles/subsdec.c b/modules/codec/subtitles/subsdec.c
index b128859b03..7545cbbd1b 100644
--- a/modules/codec/subtitles/subsdec.c
+++ b/modules/codec/subtitles/subsdec.c
@@ -284,7 +284,7 @@ static int OpenDecoder( vlc_object_t *p_this )
         psz_charset = var_InheritString (p_dec, "subsdec-encoding");
         msg_Dbg (p_dec, "trying configured character encoding: %s",
                  psz_charset ? psz_charset : "not specified");
-        if (!strcmp (psz_charset, "system"))
+        if (psz_charset != NULL && !strcmp (psz_charset, "system"))
         {
             free (psz_charset);
             psz_charset = strdup ("");