From 4f3cf8e695114ff70079ec92fdf81352525d0904 Mon Sep 17 00:00:00 2001 From: Benny Morgan Date: Sun, 30 Jun 2013 21:55:24 +0200 Subject: [PATCH] - 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. --- src/epg.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/epg.c b/src/epg.c index 280b8108..213c7e02 100644 --- a/src/epg.c +++ b/src/epg.c @@ -753,16 +753,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)) @@ -777,7 +776,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 )