From: Jaroslav Kysela Date: Wed, 18 Mar 2015 11:29:15 +0000 (+0100) Subject: mpegts input: return mutex lock order in mpegts_input_table_dispatch() X-Git-Tag: v4.1~255 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fe8e0b0c16b5bf1bf24073c9f9de43d05ea05782;p=thirdparty%2Ftvheadend.git mpegts input: return mutex lock order in mpegts_input_table_dispatch() --- diff --git a/src/input/mpegts/mpegts_input.c b/src/input/mpegts/mpegts_input.c index 83b4dbfe6..a2ffbe179 100644 --- a/src/input/mpegts/mpegts_input.c +++ b/src/input/mpegts/mpegts_input.c @@ -924,9 +924,9 @@ mpegts_input_table_dispatch ( mpegts_mux_t *mm, const uint8_t *tsb, int tsb_len mpegts_table_t *mt, **vec; /* Collate - tables may be removed during callbacks */ + pthread_mutex_lock(&mm->mm_tables_lock); i = mm->mm_num_tables; vec = alloca(i * sizeof(mpegts_table_t *)); - pthread_mutex_lock(&mm->mm_tables_lock); LIST_FOREACH(mt, &mm->mm_tables, mt_link) { c++; if (mt->mt_destroyed || !mt->mt_subscribed || mt->mt_pid != pid)