From 81236d508c877dadb805b09ec163468d261a0166 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 28 May 2014 19:30:09 +0200
Subject: [PATCH] dvr: Fix the NULL dereference caused by the previous  ccommit

---
 src/dvr/dvr_db.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c
index 71c97625..67af82ba 100644
--- a/src/dvr/dvr_db.c
+++ b/src/dvr/dvr_db.c
@@ -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;
 }