From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 20 Mar 2018 17:27:42 +0000 (+0100)
Subject: cclient: fix cc_remove_card() - wrong {}, fixes #4954
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e9a186785772a64bb17ab47af78985927458db6;p=thirdparty%2Ftvheadend.git

cclient: fix cc_remove_card() - wrong {}, fixes #4954
---

diff --git a/src/descrambler/cclient.c b/src/descrambler/cclient.c
index bf533301a..8b73a0409 100644
--- a/src/descrambler/cclient.c
+++ b/src/descrambler/cclient.c
@@ -229,14 +229,14 @@ cc_remove_card(cclient_t *cc, cc_card_data_t *pcard)
           cc_get_card_name(pcard, buf, sizeof(buf)));
 
   /* invalidate all requests */
-  LIST_FOREACH(ct, &cc->cc_services, cs_link) {
+  LIST_FOREACH(ct, &cc->cc_services, cs_link)
     for (ep = LIST_FIRST(&ct->cs_ecm_pids); ep; ep = epn) {
       epn = LIST_NEXT(ep, ep_link);
       for (es = LIST_FIRST(&ep->ep_sections); es; es = esn) {
         esn = LIST_NEXT(es, es_link);
         if (es->es_caid == pcard->cs_ra.caid) {
           emmp = pcard->cs_ra.providers;
-          for (i = 0; i < pcard->cs_ra.providers_count; i++, emmp++)
+          for (i = 0; i < pcard->cs_ra.providers_count; i++, emmp++) {
             if (emmp->id == es->es_provid) {
               cc_free_ecm_section(es);
               break;
diff --git a/src/input/mpegts/mpegts_input.c b/src/input/mpegts/mpegts_input.c
index 8e70bc9d5..3d368a78c 100644
--- a/src/input/mpegts/mpegts_input.c
+++ b/src/input/mpegts/mpegts_input.c
@@ -1668,7 +1668,9 @@ mpegts_input_thread ( void * p )
   int update_pids;
   char buf[256];
 
+  pthread_mutex_lock(&global_lock);
   mi->mi_display_name(mi, buf, sizeof(buf));
+  pthread_mutex_unlock(&global_lock);
   pthread_mutex_lock(&mi->mi_input_lock);
   while (atomic_get(&mi->mi_running)) {