subscriptions: fix the wrong memory access in subscription_unsubscribe

tvheadend · Nov 15, 2015 · fe4d7f8 · fe4d7f8
1 parent 52759be
commit fe4d7f8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/subscriptions.c b/src/subscriptions.c
@@ -599,8 +599,6 @@ subscription_unsubscribe(th_subscription_t *s, int flags)
   }
   s->ths_state = SUBSCRIPTION_ZOMBIE;
 
-  service_instance_list_clear(&s->ths_instances);
-
   LIST_REMOVE(s, ths_global_link);
   LIST_SAFE_REMOVE(s, ths_remove_link);
 
@@ -631,6 +629,8 @@ subscription_unsubscribe(th_subscription_t *s, int flags)
   if (t)
     service_remove_subscriber(t, s, SM_CODE_OK);
 
+  service_instance_list_clear(&s->ths_instances);
+
   gtimer_disarm(&s->ths_remove_timer);
 
   if ((flags & UNSUBSCRIBE_FINAL) != 0 ||