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

mpegts_network: Fix the crash on shutdown (accessing registered but freed timer)

Browse source
This commit is contained in:
Jaroslav Kysela 2014-06-11 12:24:47 +02:00
parent 59b3d8a706
commit 56196d31b0
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/input/mpegts/mpegts_network.c
View file

@ -245,9 +245,6 @@ mpegts_network_delete
mpegts_mux_t *mm;
mpegts_network_link_t *mnl;
/* Disarm scanning */
gtimer_disarm(&mn->mn_scan_timer);
/* Remove from global list */
LIST_REMOVE(mn, mn_global_link);
@ -256,6 +253,9 @@ mpegts_network_delete
mm->mm_delete(mm, delconf);
}
/* Disarm scanning */
gtimer_disarm(&mn->mn_scan_timer);
/* Remove from input */
while ((mnl = LIST_FIRST(&mn->mn_inputs)))
mpegts_network_link_delete(mnl);