From: Jaroslav Kysela <perex@perex.cz>
Date: Sun, 15 Nov 2015 22:15:18 +0000 (+0100)
Subject: subscriptions: fix the wrong memory access in subscription_unsubscribe
X-Git-Tag: v4.2.1~1539
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fe4d7f892d45eaf83b0ed3917b28b067fea6e737;p=thirdparty%2Ftvheadend.git

subscriptions: fix the wrong memory access in subscription_unsubscribe
---

diff --git a/src/subscriptions.c b/src/subscriptions.c
index ead7e2c84..10f8fa978 100644
--- 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 ||