From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 18 Nov 2015 20:27:32 +0000 (+0100)
Subject: htsmsg: add proper hmf_msg.hm_data initialization
X-Git-Tag: v4.2.1~1521
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3acbb077e731b5f942e11f8e7821a0bdb4d17226;p=thirdparty%2Ftvheadend.git

htsmsg: add proper hmf_msg.hm_data initialization
---

diff --git a/src/htsmsg.c b/src/htsmsg.c
index 02a663496..257cbfb16 100644
--- a/src/htsmsg.c
+++ b/src/htsmsg.c
@@ -355,6 +355,7 @@ static htsmsg_t *
 htsmsg_field_set_msg(htsmsg_field_t *f, htsmsg_t *sub)
 {
   assert(sub->hm_data == NULL);
+  f->hmf_msg.hm_data = NULL;
   f->hmf_msg.hm_islist = sub->hm_islist;
   TAILQ_MOVE(&f->hmf_msg.hm_fields, &sub->hm_fields, hmf_link);
   free(sub);
@@ -404,6 +405,7 @@ htsmsg_add_msg_extname(htsmsg_t *msg, const char *name, htsmsg_t *sub)
   f = htsmsg_field_add(msg, name, sub->hm_islist ? HMF_LIST : HMF_MAP, 0);
 
   assert(sub->hm_data == NULL);
+  f->hmf_msg.hm_data = NULL;
   TAILQ_MOVE(&f->hmf_msg.hm_fields, &sub->hm_fields, hmf_link);
   f->hmf_msg.hm_islist = sub->hm_islist;
   free(sub);
@@ -794,6 +796,7 @@ htsmsg_field_get_msg ( htsmsg_field_t *f, int islist )
       free((void*)f->hmf_str);
       f->hmf_type          = m->hm_islist ? HMF_LIST : HMF_MAP;
       f->hmf_msg.hm_islist = m->hm_islist;
+      f->hmf_msg.hm_data   = NULL;
       TAILQ_MOVE(&f->hmf_msg.hm_fields, &m->hm_fields, hmf_link);
       free(m);
     }