From 0af8c3e97d9165b7aa84669bc847237e17a04d14 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 30 May 2014 08:22:10 +0200 Subject: [PATCH] extjs/dvr: Fix the null pointer dereference for dvr_charset --- src/webui/extjs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/webui/extjs.c b/src/webui/extjs.c index 907fe901..fa6d9d05 100755 --- a/src/webui/extjs.c +++ b/src/webui/extjs.c @@ -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 */