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 a crash with malformed SI data

Browse Source
This commit is contained in:
Klaus Schmidinger 2011-12-04 15:09:45 +01:00
parent 04e5380723
commit 8db58ff99e
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -6779,3 +6779,4 @@ Video Disk Recorder Revision History
to Ville Skyttä). to Ville Skyttä).
- Added file name and line number to LOG_ERROR_STR() (thanks to Rolf Ahrenberg). - Added file name and line number to LOG_ERROR_STR() (thanks to Rolf Ahrenberg).
- Replaced all calls to sleep() with cCondWait::SleepMs() (thanks to Rolf Ahrenberg). - Replaced all calls to sleep() with cCondWait::SleepMs() (thanks to Rolf Ahrenberg).
- Fixed a crash with malformed SI data (patch from vdr-portal).

4
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 2.4 2011/06/15 21:26:00 kls Exp $ * $Id: si.c 2.5 2011/12/04 15:06:18 kls Exp $
* * * *
***************************************************************************/ ***************************************************************************/
@ -206,6 +206,8 @@ void DescriptorGroup::Add(GroupDescriptor *d) {
array[i]=0; array[i]=0;
} else if (length != d->getLastDescriptorNumber()+1) } else if (length != d->getLastDescriptorNumber()+1)
return; //avoid crash in case of misuse return; //avoid crash in case of misuse
if (length <= d->getDescriptorNumber())
return; // see http://www.vdr-portal.de/board60-linux/board14-betriebssystem/board69-c-t-vdr/p1025777-segfault-mit-vdr-1-7-21/#post1025777
array[d->getDescriptorNumber()]=d; array[d->getDescriptorNumber()]=d;
} }