From: Benny Morgan <benny@zuragon.com>
Date: Sun, 30 Jun 2013 19:55:24 +0000 (+0200)
Subject: - Fix - In case that num parameter was NULL, epg_episode_num_deserialize funcion... 
X-Git-Tag: 3.4patch1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c61110d68fff81254e69daebacaa0aec5e3402b;p=thirdparty%2Ftvheadend.git

- Fix - In case that num parameter was NULL, epg_episode_num_deserialize funcion would return newly calloc'd
  epg_episode_num_t, but it's never used like this, so better remove the calloc, and make it void return.
(cherry picked from commit 4f3cf8e695114ff70079ec92fdf81352525d0904)
---

diff --git a/src/epg.c b/src/epg.c
index 697dae1f6..4ce75fc38 100644
--- a/src/epg.c
+++ b/src/epg.c
@@ -767,16 +767,15 @@ static htsmsg_t *epg_episode_num_serialize ( epg_episode_num_t *num )
   return m;
 }
 
-static epg_episode_num_t *epg_episode_num_deserialize 
+static void epg_episode_num_deserialize 
   ( htsmsg_t *m, epg_episode_num_t *num )
 {
   const char *str;
   uint32_t u32;
-  if (!m) return NULL;
-  if (!num)
-    num = calloc(1, sizeof(epg_episode_num_t));
-  else
-    memset(num, 0, sizeof(epg_episode_num_t));
+  assert(!m && !num);
+
+  memset(num, 0, sizeof(epg_episode_num_t));
+
   if (!htsmsg_get_u32(m, "e_num", &u32))
     num->e_num = u32;
   if (!htsmsg_get_u32(m, "e_cnt", &u32))
@@ -791,7 +790,6 @@ static epg_episode_num_t *epg_episode_num_deserialize
     num->p_cnt = u32;
   if ((str = htsmsg_get_str(m, "text")))
     num->text = strdup(str);
-  return num;
 }
 
 static void _epg_episode_destroy ( void *eo )