From 246a1c99bb390aded81257082b935bd222f2d8c6 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Mon, 31 May 2004 08:35:12 +0200
Subject: [PATCH] Fixed handling descriptor loops in 'libsi'

---
 HISTORY    | 4 +++-
 libsi/si.c | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/HISTORY b/HISTORY
index 32571849..455a958a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2838,7 +2838,7 @@ Video Disk Recorder Revision History
 - Added some missing cStatus::MsgOsdTextItem() calls (thanks to Oliver Endriss for
   reporting this one).
 
-2004-05-29: Version 1.3.9
+2004-05-31: Version 1.3.9
 
 - Completed Croatian language texts (thanks to Drazen Dupor).
 - New iso8859-2 font to fix the problem with program freezes (thanks to Drazen Dupor).
@@ -2860,3 +2860,5 @@ Video Disk Recorder Revision History
   "Editing process finished" message (thanks to Oliver Endriss for reporting this
   one).
 - Fixed the height of the channel display in the "Classic VDR" skin.
+- Fixed handling descriptor loops in 'libsi', which had sometimes caused invalid
+  CA ids to be added to the channel definitions (thanks to Marcel Wiesweg).
diff --git a/libsi/si.c b/libsi/si.c
index 9ce46f0d..2bc8339a 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 1.9 2004/03/07 10:50:09 kls Exp $
+ *   $Id: si.c 1.10 2004/05/29 17:06:23 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -112,7 +112,7 @@ Descriptor *DescriptorLoop::getNext(Iterator &it, DescriptorTag tag, bool return
    Descriptor *d=0;
    if (it.i<getLength()) {
       const unsigned char *p=data.getData(it.i);
-      const unsigned char *end=p+getLength();
+      const unsigned char *end=p+getLength()-it.i;
       while (p < end) {
          if (Descriptor::getDescriptorTag(p) == tag) {
             d=createDescriptor(it.i, returnUnimplemetedDescriptor);
@@ -130,7 +130,7 @@ Descriptor *DescriptorLoop::getNext(Iterator &it, DescriptorTag *tags, int array
    Descriptor *d=0;
    if (it.i<getLength()) {
       const unsigned char *p=data.getData(it.i);
-      const unsigned char *end=p+getLength();
+      const unsigned char *end=p+getLength()-it.i;
       while (p < end) {
          for (int u=0; u<arrayLength;u++)
             if (Descriptor::getDescriptorTag(p) == tags[u]) {