Fixed handling incomplete multi-packet CAT

3 files changed, 7 insertions, 1 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 492bcccf..759db3cd 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -3661,6 +3661,7 @@ Helmut Binder <cco@aon.at>
  for pointing out that cChannel::Transponder(void) is called very often
  for fixing flushing old data from the section handler
  for removing unused declaration of cDvbTuner::SetFrontendType()
+ for fixing handling incomplete multi-packet CAT
 
 Ulrich Eckhardt <uli@uli-eckhardt.de>
  for reporting a problem with shutdown after user inactivity in case a plugin is
diff --git a/HISTORY b/HISTORY
index ea379e86..db217eca 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9718,3 +9718,4 @@ Video Disk Recorder Revision History
   SatIP receivers (reported by André Weidemann; with help from Helmut Binder).
 - Fixed flushing old data from the section handler (thanks to Helmut Binder).
 - Removed unused declaration of cDvbTuner::SetFrontendType() (thanks to Helmut Binder).
+- Fixed handling incomplete multi-packet CAT (thanks to Helmut Binder).
diff --git a/ci.c b/ci.c
index ed3470b1..d9d4b5ee 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * 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"
@@ -188,6 +188,10 @@ void cCaPidReceiver::Receive(const uchar *Data, int Length)
      const uchar *p = NULL;
      if (TsPayloadStart(Data)) {
         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)
            if (length > 5) {
               int v = (Data[10] & 0x3E) >> 1; // version number