]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
extjs/dvr: Fix the null pointer dereference for dvr_charset
authorJaroslav Kysela <perex@perex.cz>
Fri, 30 May 2014 06:22:10 +0000 (08:22 +0200)
committerJaroslav Kysela <perex@perex.cz>
Fri, 30 May 2014 06:22:10 +0000 (08:22 +0200)
src/webui/extjs.c

index 907fe901e4dee93ef0f94607aa0f352a7e677d43..fa6d9d05579d51d22c7baecfe0545a8f2a258be4 100755 (executable)
@@ -1127,7 +1127,7 @@ extjs_dvr(http_connection_t *hc, const char *remain, void *opaque)
 
     r = htsmsg_create_map();
     htsmsg_add_str(r, "storage", cfg->dvr_storage);
-    htsmsg_add_str(r, "charset", cfg->dvr_charset);
+    htsmsg_add_str(r, "charset", cfg->dvr_charset ? cfg->dvr_charset : "UTF-8");
     htsmsg_add_str(r, "container", muxer_container_type2txt(cfg->dvr_mc));
 
 /* Convert integer permissions to an octal-format 0xxx string and store it in the config file */