From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 21 Nov 2017 19:00:05 +0000 (+0100)
Subject: dvbcam: fix crash (NULL dereference)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2956190645ab919130670f2ec4b52211bceb6000;p=thirdparty%2Ftvheadend.git

dvbcam: fix crash (NULL dereference)
---

diff --git a/src/descrambler/dvbcam.c b/src/descrambler/dvbcam.c
index 719eb22ec..73b6135a3 100644
--- a/src/descrambler/dvbcam.c
+++ b/src/descrambler/dvbcam.c
@@ -313,11 +313,14 @@ dvbcam_service_destroy(th_descrambler_t *td)
   LIST_REMOVE(td, td_service_link);
   TAILQ_REMOVE(&dvbcam_active_services, as, global_link);
   if (do_active_programs) {
-    TAILQ_FOREACH(ac, &dvbcam_active_cams, global_link)
-      if (as->ac == ac)
+    TAILQ_FOREACH(ac, &dvbcam_active_cams, global_link) {
+      if (as->ac == ac) {
         ac->active_programs--;
+        ac->allocated_programs--;
+        break;
+      }
+    }
   }
-  ac->allocated_programs--;
   mpegts_pid_done(&as->ecm_pids);
   mpegts_pid_done(&as->cat_pids);
   free(as->cat_data);