]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
subscriptions: fix the wrong memory access in subscription_unsubscribe
authorJaroslav Kysela <perex@perex.cz>
Sun, 15 Nov 2015 22:15:18 +0000 (23:15 +0100)
committerJaroslav Kysela <perex@perex.cz>
Sun, 15 Nov 2015 22:15:29 +0000 (23:15 +0100)
src/subscriptions.c

index ead7e2c84e39a3c276628414b2dbc1772c5a26b1..10f8fa97823f5036a6d384d3b6ef598b64c82133 100644 (file)
@@ -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 ||