From: Andreas Öman <andreas@lonelycoder.com>
Date: Mon, 29 Nov 2010 18:58:26 +0000 (+0000)
Subject: Fix memory corruption
X-Git-Tag: 2.12~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d917e05c2749950cad84532cb0b6c4c9f85976dd;p=thirdparty%2Ftvheadend.git

Fix memory corruption
---

diff --git a/src/htsp.c b/src/htsp.c
index e9b13dc51..99fb63277 100644
--- a/src/htsp.c
+++ b/src/htsp.c
@@ -322,11 +322,11 @@ htsp_build_channel(channel_t *ch, const char *method)
     uint16_t caid;
     htsmsg_add_str(svcmsg, "name", transport_nicename(t));
     htsmsg_add_str(svcmsg, "type", transport_servicetype_txt(t));
-    htsmsg_add_msg(services, NULL, svcmsg);
     if((caid = transport_get_encryption(t)) != 0) {
       htsmsg_add_u32(svcmsg, "caid", caid);
       htsmsg_add_str(svcmsg, "caname", psi_caid2name(caid));
     }
+    htsmsg_add_msg(services, NULL, svcmsg);
   }
 
   htsmsg_add_msg(out, "services", services);