From: Sven Wegener <sven.wegener@stealer.net>
Date: Tue, 10 Nov 2015 23:33:53 +0000 (+0100)
Subject: prop: list might be called on idclass without an idnode
X-Git-Tag: v4.2.1~1549
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8921df2981d5e006dd3db3a0172132e682b9aef5;p=thirdparty%2Ftvheadend.git

prop: list might be called on idclass without an idnode

Signed-off-by: Sven Wegener <sven.wegener@stealer.net>
---

diff --git a/src/input/mpegts/mpegts_input.c b/src/input/mpegts/mpegts_input.c
index c58fcea80..6f5e8d757 100644
--- a/src/input/mpegts/mpegts_input.c
+++ b/src/input/mpegts/mpegts_input.c
@@ -96,6 +96,9 @@ mpegts_input_class_network_enum ( void *obj, const char *lang )
 {
   htsmsg_t *p, *m;
 
+  if (!obj)
+    return NULL;
+
   p = htsmsg_create_map();
   htsmsg_add_str (p, "uuid",    idnode_uuid_as_sstr((idnode_t*)obj));
   htsmsg_add_bool(p, "enum",    1);
diff --git a/src/prop.c b/src/prop.c
index 60fc309da..905135e5d 100644
--- a/src/prop.c
+++ b/src/prop.c
@@ -484,8 +484,11 @@ prop_serialize_value
     htsmsg_add_bool(m, "multiline", 1);
 
   /* Enum list */
-  if (pl->list)
-    htsmsg_add_msg(m, "enum", pl->list(obj, lang));
+  if (pl->list) {
+    htsmsg_t *list = pl->list(obj, lang);
+    if (list)
+      htsmsg_add_msg(m, "enum", list);
+  }
 
   /* Visual group */
   if (pl->group)