From ec861d81e8ddfd118e5943f5537d86f615f91862 Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Mon, 21 Apr 2014 15:10:22 +0100 Subject: [PATCH] subscriptions: fix potential recursion --- src/subscriptions.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/subscriptions.c b/src/subscriptions.c index 84209c6a..0154291b 100644 --- a/src/subscriptions.c +++ b/src/subscriptions.c @@ -153,6 +153,7 @@ subscription_unlink_mux(th_subscription_t *s, int reason) mpegts_input_t *mi = mmi->mmi_input; pthread_mutex_lock(&mi->mi_output_lock); + s->ths_mmi = NULL; if (!(s->ths_flags & SUBSCRIPTION_NONE)) streaming_target_disconnect(&mmi->mmi_streaming_pad, &s->ths_input); @@ -162,7 +163,6 @@ subscription_unlink_mux(th_subscription_t *s, int reason) if (mi && (s->ths_flags & SUBSCRIPTION_FULLMUX)) mi->mi_close_pid(mi, mm, MPEGTS_FULLMUX_PID, MPS_NONE, s); - s->ths_mmi = NULL; LIST_REMOVE(s, ths_mmi_link); pthread_mutex_unlock(&mi->mi_output_lock);