From: Flole998 <Flole998@users.noreply.github.com>
Date: Thu, 18 Feb 2021 00:13:00 +0000 (+0100)
Subject: Fix uninitialized memory access for several ioctl commands (#1382)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71a597df3e8a2f1c075c21e5786a2f88e334e20d;p=thirdparty%2Ftvheadend.git

Fix uninitialized memory access for several ioctl commands (#1382)

* Fix uninitialized memory access in linuxdvb_frontend.c

* FIx unitialized memory access in linuxdvb_satconf.c
---

diff --git a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
index d3639cb9a..536792f9d 100644
--- a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
@@ -1560,11 +1560,11 @@ linuxdvb_frontend_clear
     dvb_mux_t *lm = (dvb_mux_t*)mmi->mmi_mux;
     dvb_mux_conf_t *dmc = &lm->lm_tuning;
 
-    struct dtv_property delsys_p;
-    struct dtv_properties delsys_cmdseq = {
-      .num = 1,
-      .props = &delsys_p
-    };
+    memset(&delsys_p, 0, sizeof(delsys_p));
+    struct dtv_properties delsys_cmdseq;
+    memset(&delsys_cmdseq, 0, sizeof(delsys_cmdseq));
+    delsys_cmdseq.num = 1;
+    delsys_cmdseq.props = &delsys_p;
     delsys_p.cmd = DTV_DELIVERY_SYSTEM;
     delsys_p.u.data = TR(delsys, delsys_tbl, SYS_UNDEFINED);
     if ((ioctl(lfe->lfe_fe_fd, FE_SET_PROPERTY, &delsys_cmdseq)) != 0) {
diff --git a/src/input/mpegts/linuxdvb/linuxdvb_satconf.c b/src/input/mpegts/linuxdvb/linuxdvb_satconf.c
index 966345f71..fdc2562a1 100644
--- a/src/input/mpegts/linuxdvb/linuxdvb_satconf.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_satconf.c
@@ -1811,6 +1811,7 @@ linuxdvb_diseqc_send
   size_t c = 0;
 
   /* Build message */
+  memset(&message, 0, sizeof(message));
   message.msg_len = len + 3;
   message.msg[0]  = framing;
   message.msg[1]  = addr;