stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

subscriptions: manage ths_mux_link early to avoid wrong memory accesses

Browse source
This commit is contained in:
Jaroslav Kysela 2015-03-11 16:27:07 +01:00
parent 7cafa5ef70
commit be3749f45c
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/subscriptions.c
View file

@ -514,6 +514,11 @@ subscription_unsubscribe(th_subscription_t *s, int quiet)
LIST_REMOVE(s, ths_global_link);
#if ENABLE_MPEGTS
if (s->ths_raw_service)
LIST_REMOVE(s, ths_mux_link);
#endif
if (s->ths_channel != NULL) {
LIST_REMOVE(s, ths_channel_link);
snprintf(buf, sizeof(buf), "\"%s\" unsubscribing from \"%s\"",
@ -537,10 +542,8 @@ subscription_unsubscribe(th_subscription_t *s, int quiet)
}
#if ENABLE_MPEGTS
if (s->ths_raw_service) {
LIST_REMOVE(s, ths_mux_link);
if (s->ths_raw_service)
service_destroy(s->ths_raw_service, 0);
}
#endif
streaming_msg_free(s->ths_start_message);