scanfile: fix NULL dereference (srl_alt_type)

tvheadend · Mar 18, 2016 · 30e08bd · 30e08bd
1 parent 850f8e4
commit 30e08bd
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/input/mpegts/scanfile.c b/src/input/mpegts/scanfile.c
@@ -911,15 +911,17 @@ scanfile_region_list_t *
 scanfile_find_region_list ( const char *type )
 {
   scanfile_region_list_t *list = NULL;
+  scanfile_region_list_t *ptr = scanfile_regions;
   int i;
-  if (scanfile_regions == NULL)
+  if (ptr == NULL)
     return NULL;
-  for (i = 0; i < REGIONS; i++)
-    if (strcasecmp(scanfile_regions[i].srl_type, type) == 0 ||
-        strcasecmp(scanfile_regions[i].srl_alt_type, type) == 0) {
-      list = &scanfile_regions[i];
+  for (i = 0; i < REGIONS; i++, ptr++) {
+    if (strcasecmp(ptr->srl_type, type) == 0 ||
+        (ptr->srl_alt_type && strcasecmp(ptr->srl_alt_type, type) == 0)) {
+      list = ptr;
       break;
     }
+  }
   return list;
 }