summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2015-09-16 14:08:42 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2015-09-16 14:08:42 +0200
commit5d249c1ae51550636b1879621354ea05ba2e5a64 (patch)
tree33262137e6a4493161afe218d13aa1f6f3c3e96f
parent09e64c24f277a8433848d320fb3dc70c2f7d1b25 (diff)
downloadvdr-5d249c1ae51550636b1879621354ea05ba2e5a64.tar.gz
vdr-5d249c1ae51550636b1879621354ea05ba2e5a64.tar.bz2
Fixed an overflow of PIDs in a receiver
-rw-r--r--CONTRIBUTORS3
-rw-r--r--HISTORY1
-rw-r--r--receiver.c8
3 files changed, 9 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 4d629256..ad1c3362 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -3429,3 +3429,6 @@ Janne Pänkälä <epankala@gmail.com>
Stefan Pöschel <basic.master@gmx.de>
for coding the AFFcleaner, parts of which were used to make the recorder skip empty
adaptation field TS packets
+
+Robert Hannebauer <vdr@hannebauer.org>
+ for fixing an overflow of PIDs in a receiver
diff --git a/HISTORY b/HISTORY
index 4e08a288..e9089d27 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8831,3 +8831,4 @@ Video Disk Recorder Revision History
2015-09-16: Version 2.3.2
- Fixed a crash when deleting a recording (reported by Oliver Endriss).
+- Fixed an overflow of PIDs in a receiver (thanks to Robert Hannebauer).
diff --git a/receiver.c b/receiver.c
index d8f51e68..8d647c02 100644
--- a/receiver.c
+++ b/receiver.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: receiver.c 3.3 2015/01/12 14:04:31 kls Exp $
+ * $Id: receiver.c 4.1 2015/09/16 11:19:47 kls Exp $
*/
#include "receiver.h"
@@ -37,8 +37,10 @@ void cReceiver::SetPriority(int Priority)
bool cReceiver::AddPid(int Pid)
{
if (Pid) {
- if (numPids < MAXRECEIVEPIDS)
- pids[numPids++] = Pid;
+ if (numPids < MAXRECEIVEPIDS) {
+ if (!WantsPid(Pid))
+ pids[numPids++] = Pid;
+ }
else {
dsyslog("too many PIDs in cReceiver (Pid = %d)", Pid);
return false;