subscription: for stupid mistake causing double free()'s

diff --git a/src/input/mpegts/mpegts_mux.c b/src/input/mpegts/mpegts_mux.c
index a0edd5d76169efd3c4b07046c401532fa72d5caa..ab52083ee4fd358f1e1ab01437a4d676f64fe2d3 100644 (file)
--- a/src/input/mpegts/mpegts_mux.c
+++ b/src/input/mpegts/mpegts_mux.c
@@ -656,7 +656,7 @@ mpegts_mux_unsubscribe_by_name
 
   LIST_FOREACH(mmi, &mm->mm_instances, mmi_mux_link)
     LIST_FOREACH(s, &mmi->mmi_subs, ths_mmi_link)
-      if (!strcmp(s->ths_title, "initscan"))
+      if (!strcmp(s->ths_title, name))
         subscription_unsubscribe(s);
 }
 

diff --git a/src/subscriptions.c b/src/subscriptions.c
index ad66da9d120ce4d0b0c851d308bbe07cdb056fde..1b34f1553fd862091bcfb77c7e64047cad7d8cd3 100644 (file)
--- a/src/subscriptions.c
+++ b/src/subscriptions.c
@@ -252,8 +252,8 @@ subscription_reschedule(void)
 static void
 subscription_input_null(void *opaque, streaming_message_t *sm)
 {
-  if (sm->sm_type == SMT_STOP) {
-    th_subscription_t *s = opaque;
+  th_subscription_t *s = opaque;
+  if (sm->sm_type == SMT_STOP && s->ths_state != SUBSCRIPTION_ZOMBIE) {
     LIST_INSERT_HEAD(&subscriptions_remove, s, ths_remove_link);
     gtimer_arm(&subscription_reschedule_timer, 
               subscription_reschedule_cb, NULL, 0);
@@ -348,6 +348,8 @@ subscription_unsubscribe(th_subscription_t *s)
 
   lock_assert(&global_lock);
 
+  s->ths_state = SUBSCRIPTION_ZOMBIE;
+
   service_instance_list_clear(&s->ths_instances);
 
   LIST_REMOVE(s, ths_global_link);

diff --git a/src/subscriptions.h b/src/subscriptions.h
index 7095897e385a9d632c2d5f2bb1ed66b40701cf70..5287c6f2c1d29ef6c51f2290440422c446d23a9b 100644 (file)
--- a/src/subscriptions.h
+++ b/src/subscriptions.h
@@ -39,6 +39,7 @@ typedef struct th_subscription {
     SUBSCRIPTION_TESTING_SERVICE,
     SUBSCRIPTION_GOT_SERVICE,
     SUBSCRIPTION_BAD_SERVICE,
+    SUBSCRIPTION_ZOMBIE
   } ths_state;
 
   int ths_testing_error;