From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 3 Oct 2014 19:20:23 +0000 (+0200)
Subject: satip: coverity fixes
X-Git-Tag: v4.1~1154
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1069ff4d7efbd2d0aceca1b98c8fd02872d51589;p=thirdparty%2Ftvheadend.git

satip: coverity fixes
---

diff --git a/src/input/mpegts/satip/satip.c b/src/input/mpegts/satip/satip.c
index 2f7cbba31..694a318dc 100644
--- a/src/input/mpegts/satip/satip.c
+++ b/src/input/mpegts/satip/satip.c
@@ -385,7 +385,7 @@ satip_device_create( satip_device_info_t *info )
 
   if (!tvh_hardware_create0((tvh_hardware_t*)sd, &satip_device_class,
                             uuid.hex, conf)) {
-    free(sd);
+    /* Note: sd is freed in above fcn */
     return NULL;
   }
 
@@ -882,9 +882,9 @@ satip_discovery_service_received
   /* Sanity checks */
   if (st == NULL || strcmp(st, "urn:ses-com:device:SatIPServer:1"))
     return;
-  if (uuid == NULL && strlen(uuid) < 16)
+  if (uuid == NULL || strlen(uuid) < 16)
     return;
-  if (location == NULL && strncmp(location, "http://", 7))
+  if (location == NULL || strncmp(location, "http://", 7))
     return;
   if (bootid == NULL || configid == NULL || server == NULL)
     return;