From c64d2327e5de8aea19f6ef0d7ba33c000de646d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96man?= <andreas@lonelycoder.com>
Date: Tue, 5 Oct 2010 19:47:33 +0000
Subject: [PATCH] Avoid NULL ptr deref

---
 src/dvr/mkmux.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/dvr/mkmux.c b/src/dvr/mkmux.c
index d19dd489..d9930d25 100644
--- a/src/dvr/mkmux.c
+++ b/src/dvr/mkmux.c
@@ -432,7 +432,7 @@ mk_build_metadata(const dvr_entry_t *de)
   htsbuf_queue_t *q = htsbuf_queue_alloc(0);
   char datestr[64];
   struct tm tm;
-
+  const char *ctype;
   localtime_r(&de->de_start, &tm);
 
   snprintf(datestr, sizeof(datestr),
@@ -448,10 +448,12 @@ mk_build_metadata(const dvr_entry_t *de)
 
   addtag(q, build_tag_string("ORIGINAL_MEDIA_TYPE", "TV", 0, NULL));
 
-  if(de->de_content_type)
-    addtag(q, build_tag_string("CONTENT_TYPE", 
-			       epg_content_group_get_name(de->de_content_type),
-			       0, NULL));
+  
+  if(de->de_content_type) {
+    ctype = epg_content_group_get_name(de->de_content_type);
+    if(ctype != NULL)
+      addtag(q, build_tag_string("CONTENT_TYPE", ctype, 0, NULL));
+  }
 
   if(de->de_channel != NULL)
     addtag(q, build_tag_string("TVCHANNEL", de->de_channel->ch_name, 0, NULL));