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 descriptor loops in 'libsi'

Browse Source
This commit is contained in:
Klaus Schmidinger 2004-05-31 08:35:12 +02:00
parent 1bc35792d1
commit 246a1c99bb
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -2838,7 +2838,7 @@ Video Disk Recorder Revision History
- Added some missing cStatus::MsgOsdTextItem() calls (thanks to Oliver Endriss for - Added some missing cStatus::MsgOsdTextItem() calls (thanks to Oliver Endriss for
reporting this one). 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). - Completed Croatian language texts (thanks to Drazen Dupor).
- New iso8859-2 font to fix the problem with program freezes (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 "Editing process finished" message (thanks to Oliver Endriss for reporting this
one). one).
- Fixed the height of the channel display in the "Classic VDR" skin. - 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).

6
libsi/si.c
View File

@ -6,7 +6,7 @@
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. * * (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; Descriptor *d=0;
if (it.i<getLength()) { if (it.i<getLength()) {
const unsigned char *p=data.getData(it.i); 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) { while (p < end) {
if (Descriptor::getDescriptorTag(p) == tag) { if (Descriptor::getDescriptorTag(p) == tag) {
d=createDescriptor(it.i, returnUnimplemetedDescriptor); d=createDescriptor(it.i, returnUnimplemetedDescriptor);
@ -130,7 +130,7 @@ Descriptor *DescriptorLoop::getNext(Iterator &it, DescriptorTag *tags, int array
Descriptor *d=0; Descriptor *d=0;
if (it.i<getLength()) { if (it.i<getLength()) {
const unsigned char *p=data.getData(it.i); 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) { while (p < end) {
for (int u=0; u<arrayLength;u++) for (int u=0; u<arrayLength;u++)
if (Descriptor::getDescriptorTag(p) == tags[u]) { if (Descriptor::getDescriptorTag(p) == tags[u]) {