]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
dvr: Fix the NULL dereference caused by the previous ccommit
authorJaroslav Kysela <perex@perex.cz>
Wed, 28 May 2014 17:30:09 +0000 (19:30 +0200)
committerJaroslav Kysela <perex@perex.cz>
Wed, 28 May 2014 17:30:09 +0000 (19:30 +0200)
src/dvr/dvr_db.c

index 71c976257a4195ffa2e94b87f2b4c4cf89233a80..67af82bab596074dcf4fc5b0d8a89eb7a0036d53 100644 (file)
@@ -176,7 +176,7 @@ dvr_charset_update(dvr_config_t *cfg, const char *charset)
   free(cfg->dvr_charset_id);
   s = charset ? charset : intlconv_filesystem_charset();
   id = intlconv_charset_id(s, 1, 1);
-  cfg->dvr_charset = strdup(s);
+  cfg->dvr_charset = s ? strdup(s) : NULL;
   cfg->dvr_charset_id = id ? strdup(id) : NULL;
 }