diff options
author | Klaus Schmidinger <vdr@tvdr.de> | 2017-12-16 13:13:13 +0100 |
---|---|---|
committer | Klaus Schmidinger <vdr@tvdr.de> | 2017-12-16 13:13:13 +0100 |
commit | 5467bc4f24666cb831c9195f4e5d4294f5dc956e (patch) | |
tree | 585c9993edc6f26814c5d4d4665407023bb9ab71 | |
parent | 477fb7dc20971fc07c45dbf9765e4bd8302d6682 (diff) | |
download | vdr-5467bc4f24666cb831c9195f4e5d4294f5dc956e.tar.gz vdr-5467bc4f24666cb831c9195f4e5d4294f5dc956e.tar.bz2 |
Fixed a possible deadlock when detaching a receiver from a device
-rw-r--r-- | HISTORY | 1 | ||||
-rw-r--r-- | device.c | 10 |
2 files changed, 5 insertions, 6 deletions
@@ -9241,3 +9241,4 @@ Video Disk Recorder Revision History (suggested by Matthias Senzel). - When selecting a folder for a recording or timer, it is now possible to open a folder even if it doesn't contain any subfolders (suggested by Matthias Senzel). +- Fixed a possible deadlock when detaching a receiver from a device. @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: device.c 4.24 2017/08/31 11:34:54 kls Exp $ + * $Id: device.c 4.25 2017/12/16 13:13:13 kls Exp $ */ #include "device.h" @@ -1673,6 +1673,7 @@ void cDevice::Action(void) int Pid = TsPid(b); bool IsScrambled = TsIsScrambled(b); for (int i = 0; i < MAXRECEIVERS; i++) { + cMutexLock MutexLock(&mutexReceiver); cReceiver *Receiver = receiver[i]; if (Receiver && Receiver->WantsPid(Pid)) { Receiver->Receive(b, TS_SIZE); @@ -1768,10 +1769,8 @@ bool cDevice::AttachReceiver(cReceiver *Receiver) } } Receiver->Activate(true); - Lock(); Receiver->device = this; receiver[i] = Receiver; - Unlock(); if (camSlot && Receiver->priority > MINPRIORITY) { // priority check to avoid an infinite loop with the CAM slot's caPidReceiver camSlot->StartDecrypting(); if (camSlot->WantsTsData()) { @@ -1801,13 +1800,11 @@ void cDevice::Detach(cReceiver *Receiver) if (!Receiver || Receiver->device != this) return; bool receiversLeft = false; - cMutexLock MutexLock(&mutexReceiver); + mutexReceiver.Lock(); for (int i = 0; i < MAXRECEIVERS; i++) { if (receiver[i] == Receiver) { - Lock(); receiver[i] = NULL; Receiver->device = NULL; - Unlock(); Receiver->Activate(false); for (int n = 0; n < Receiver->numPids; n++) DelPid(Receiver->pids[n]); @@ -1815,6 +1812,7 @@ void cDevice::Detach(cReceiver *Receiver) else if (receiver[i]) receiversLeft = true; } + mutexReceiver.Unlock(); if (camSlot) { if (Receiver->priority > MINPRIORITY) { // priority check to avoid an infinite loop with the CAM slot's caPidReceiver camSlot->StartDecrypting(); |