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

tvheadend · Jun 27, 2015 · 6bf1aba · 6bf1aba
1 parent fe75fa0
commit 6bf1aba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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();