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 the 'libsi' function CharArray::checkSize(), which made a previous workaround in libsi/descriptor.c obsolete

Browse Source
This commit is contained in:
Klaus Schmidinger 2006-02-25 10:21:29 +01:00
parent 39cefd4b27
commit 6a0a6c15c0
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -4360,10 +4360,12 @@ Video Disk Recorder Revision History
- Added a comment to tChannelID::nid, explaining that is is actually the "original" - Added a comment to tChannelID::nid, explaining that is is actually the "original"
network id. network id.
2006-02-24: Version 1.3.44 2006-02-25: Version 1.3.44
- Fixed setting the audio language codes in 'Transfer-Mode' (reported by Rolf - Fixed setting the audio language codes in 'Transfer-Mode' (reported by Rolf
Ahrenberg). The actual problem was the call to the Transferring() function in Ahrenberg). The actual problem was the call to the Transferring() function in
cDevice::AttachPlayer() before assigning the player. cDevice::AttachPlayer() before assigning the player.
- Fixed removing the '-' when entering a channel number where there is no other - Fixed removing the '-' when entering a channel number where there is no other
one that fits the input (thanks to Joachim Wilke). one that fits the input (thanks to Joachim Wilke).
- Fixed the 'libsi' function CharArray::checkSize(), which made a previous workaround
in libsi/descriptor.c obsolete (thanks to Marcel Wiesweg).

6
libsi/descriptor.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: descriptor.c 1.17 2006/02/18 11:02:25 kls Exp $ * $Id: descriptor.c 1.18 2006/02/25 10:06:05 kls Exp $
* * * *
***************************************************************************/ ***************************************************************************/
@ -331,8 +331,6 @@ void CaDescriptor::Parse() {
data.setPointerAndOffset<const descr_ca>(s, offset); data.setPointerAndOffset<const descr_ca>(s, offset);
if (checkSize(getLength()-offset)) if (checkSize(getLength()-offset))
privateData.assign(data.getData(offset), getLength()-offset); privateData.assign(data.getData(offset), getLength()-offset);
else
privateData.assign(NULL, 0);
} }
int StreamIdentifierDescriptor::getComponentTag() const { int StreamIdentifierDescriptor::getComponentTag() const {
@ -640,8 +638,6 @@ void LinkageDescriptor::Parse() {
data.setPointerAndOffset<const descr_linkage>(s, offset); data.setPointerAndOffset<const descr_linkage>(s, offset);
if (checkSize(getLength()-offset)) if (checkSize(getLength()-offset))
privateData.assign(data.getData(offset), getLength()-offset); privateData.assign(data.getData(offset), getLength()-offset);
else
privateData.assign(NULL, 0);
} }
int LinkageDescriptor::getTransportStreamId() const { int LinkageDescriptor::getTransportStreamId() const {

4
libsi/util.h
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: util.h 1.6 2006/02/18 10:38:20 kls Exp $ * $Id: util.h 1.7 2006/02/25 10:13:28 kls Exp $
* * * *
***************************************************************************/ ***************************************************************************/
@ -59,7 +59,7 @@ public:
u_int32_t FourBytes(const int index) const { return data_->data ? data_->FourBytes(off+index) : 0; } u_int32_t FourBytes(const int index) const { return data_->data ? data_->FourBytes(off+index) : 0; }
bool isValid() const { return data_->valid; } bool isValid() const { return data_->valid; }
bool checkSize(int offset) { return (data_->valid && offset>=0 && (data_->valid=(off+offset < data_->size))); } bool checkSize(int offset) { return (data_->valid && (data_->valid=(offset>=0 && off+offset < data_->size))); }
void addOffset(int offset) { off+=offset; } void addOffset(int offset) { off+=offset; }
private: private: