From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 16 Jan 2018 11:04:56 +0000 (+0100)
Subject: iptv http: some cleanups
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=76b7f398331e88d5b42b9d8463314bee6cf16d86;p=thirdparty%2Ftvheadend.git

iptv http: some cleanups
---

diff --git a/src/input/mpegts/iptv/iptv_http.c b/src/input/mpegts/iptv/iptv_http.c
index 21ae0819d..a94a690fd 100644
--- a/src/input/mpegts/iptv/iptv_http.c
+++ b/src/input/mpegts/iptv/iptv_http.c
@@ -271,7 +271,8 @@ iptv_http_data
   int pause = 0, off, rem;
   uint8_t tsbuf[188];
 
-  if (hp == NULL || hp->im == NULL || hc->hc_code != HTTP_STATUS_OK)
+  if (hp == NULL || hp->shutdown || hp->im == NULL ||
+      hc->hc_code != HTTP_STATUS_OK)
     return 0;
 
   im = hp->im;
@@ -385,7 +386,7 @@ iptv_http_complete
   htsmsg_t *m, *m2;
   int r;
 
-  if (hp == NULL || hp->im == NULL)
+  if (hp == NULL || hp->shutdown || hp->im == NULL)
     return 0;
 
   if (hp->m3u_header) {
@@ -473,7 +474,7 @@ iptv_http_complete_key
 {
   http_priv_t *hp = hc->hc_aux;
 
-  if (hp == NULL)
+  if (hp == NULL || hp->shutdown)
     return 0;
   tvhtrace(LS_IPTV, "received key len %d", hp->key_sbuf.sb_ptr);
   if (hp->key_sbuf.sb_ptr != AES_BLOCK_SIZE) {
@@ -499,7 +500,7 @@ iptv_http_create_header
 {
   http_priv_t *hp = hc->hc_aux;
 
-  if (hp == NULL || hp->im == NULL)
+  if (hp == NULL || hp->shutdown || hp->im == NULL)
     return;
   http_client_basic_args(hc, h, url, keepalive);
   http_client_add_args(hc, h, hp->im->mm_iptv_hdr);
@@ -555,7 +556,6 @@ iptv_http_stop
 {
   http_priv_t *hp = im->im_data;
 
-  hp->hc->hc_aux = NULL;
   hp->shutdown = 1;
   pthread_mutex_unlock(&iptv_lock);
   http_client_close(hp->hc);