frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed handling incomplete multi-packet CAT

Browse Source
This commit is contained in:
Klaus Schmidinger 2021-06-09 09:42:15 +02:00
parent 9686a9b474
commit 60c858689b
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -3661,6 +3661,7 @@ Helmut Binder <cco@aon.at>
for pointing out that cChannel::Transponder(void) is called very often for pointing out that cChannel::Transponder(void) is called very often
for fixing flushing old data from the section handler for fixing flushing old data from the section handler
for removing unused declaration of cDvbTuner::SetFrontendType() for removing unused declaration of cDvbTuner::SetFrontendType()
for fixing handling incomplete multi-packet CAT
Ulrich Eckhardt <uli@uli-eckhardt.de> Ulrich Eckhardt <uli@uli-eckhardt.de>
for reporting a problem with shutdown after user inactivity in case a plugin is for reporting a problem with shutdown after user inactivity in case a plugin is

1
HISTORY
View File

@ -9718,3 +9718,4 @@ Video Disk Recorder Revision History
SatIP receivers (reported by André Weidemann; with help from Helmut Binder). SatIP receivers (reported by André Weidemann; with help from Helmut Binder).
- Fixed flushing old data from the section handler (thanks to Helmut Binder). - Fixed flushing old data from the section handler (thanks to Helmut Binder).
- Removed unused declaration of cDvbTuner::SetFrontendType() (thanks to Helmut Binder). - Removed unused declaration of cDvbTuner::SetFrontendType() (thanks to Helmut Binder).
- Fixed handling incomplete multi-packet CAT (thanks to Helmut Binder).

6
ci.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: ci.c 4.32 2020/08/17 10:26:18 kls Exp $ * $Id: ci.c 5.1 2021/06/09 09:41:18 kls Exp $
*/ */
#include "ci.h" #include "ci.h"
@ -188,6 +188,10 @@ void cCaPidReceiver::Receive(const uchar *Data, int Length)
const uchar *p = NULL; const uchar *p = NULL;
if (TsPayloadStart(Data)) { if (TsPayloadStart(Data)) {
if (Data[5] == SI::TableIdCAT) { if (Data[5] == SI::TableIdCAT) {
if (bufp) { // incomplete multi-packet CAT
catVersion = -1;
bufp = NULL;
}
length = (int(Data[6] & 0x0F) << 8) | Data[7]; // section length (12 bit field) length = (int(Data[6] & 0x0F) << 8) | Data[7]; // section length (12 bit field)
if (length > 5) { if (length > 5) {
int v = (Data[10] & 0x3E) >> 1; // version number int v = (Data[10] & 0x3E) >> 1; // version number