From: Kyle Sanderson <kyle.leet@gmail.com>
Date: Sat, 27 Jun 2015 01:36:54 +0000 (-0700)
Subject: Fix pointer -> char (NUL) comparisons in dvr_rec and mpegts/scanfile.
X-Git-Tag: v4.2.1~2219
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bf1abaaca896687532cdf33524342ef06a44d0b;p=thirdparty%2Ftvheadend.git

Fix pointer -> char (NUL) comparisons in dvr_rec and mpegts/scanfile.
---

diff --git a/src/dvr/dvr_rec.c b/src/dvr/dvr_rec.c
index 827eabc25..d0a712af0 100644
--- a/src/dvr/dvr_rec.c
+++ b/src/dvr/dvr_rec.c
@@ -539,7 +539,7 @@ pvr_generate_filename(dvr_entry_t *de, const streaming_start_t *ss)
     return -1;
 
   cfg = de->de_config;
-  if (cfg->dvr_storage == NULL || cfg->dvr_storage == '\0')
+  if (cfg->dvr_storage == NULL || *(cfg->dvr_storage) == '\0')
     return -1;
 
   localtime_r(&de->de_start, &tm);
diff --git a/src/input/mpegts/scanfile.c b/src/input/mpegts/scanfile.c
index eb124272a..b3cb6d559 100644
--- a/src/input/mpegts/scanfile.c
+++ b/src/input/mpegts/scanfile.c
@@ -374,7 +374,7 @@ scanfile_load_dvbv5 ( scanfile_network_t *net, char *line, fb_file *fp )
 
   /* validity check for [text] */
   s = str_trim(line);
-  if (s == '\0' || s[strlen(s) - 1] != ']')
+  if (*s == '\0' || s[strlen(s) - 1] != ']')
     return 1;
 
   l = htsmsg_create_map();