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

TsGetPayload() now checks if there actually is a payload in the given TS packet

Browse Source
This commit is contained in:
Klaus Schmidinger 2011-05-21 10:03:48 +02:00
parent ee382b4ad2
commit 85af76ab63
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -2702,3 +2702,5 @@ Mika Laitio <lamikr@pilppa.org>
Dirk Leber <dirk.leber@reel-multimedia.com> Dirk Leber <dirk.leber@reel-multimedia.com>
for fixing cString's operator=(const char *String) in case the given string is the for fixing cString's operator=(const char *String) in case the given string is the
same as the existing one same as the existing one
for reporting that TsGetPayload() gets called without checking whether there actually
is a payload in the given TS packet

2
HISTORY
View File

@ -6612,3 +6612,5 @@ Video Disk Recorder Revision History
- Fixed cString's operator=(const char *String) in case the given string is the - Fixed cString's operator=(const char *String) in case the given string is the
same as the existing one (thanks to Dirk Leber). same as the existing one (thanks to Dirk Leber).
- Avoiding a gcc 4.6 compiler error in the skincurses plugin (thanks to Tobias Grimm). - Avoiding a gcc 4.6 compiler error in the skincurses plugin (thanks to Tobias Grimm).
- TsGetPayload() now checks if there actually is a payload in the given TS packet
(reported by Dirk Leber).

13
remux.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: remux.h 2.28 2011/03/19 16:52:46 kls Exp $ * $Id: remux.h 2.29 2011/05/21 09:53:54 kls Exp $
*/ */
#ifndef __REMUX_H #ifndef __REMUX_H
@ -84,15 +84,18 @@ inline bool TsIsScrambled(const uchar *p)
inline int TsPayloadOffset(const uchar *p) inline int TsPayloadOffset(const uchar *p)
{ {
int o = (p[3] & TS_ADAPT_FIELD_EXISTS) ? p[4] + 5 : 4; int o = TsHasAdaptationField(p) ? p[4] + 5 : 4;
return o <= TS_SIZE ? o : TS_SIZE; return o <= TS_SIZE ? o : TS_SIZE;
} }
inline int TsGetPayload(const uchar **p) inline int TsGetPayload(const uchar **p)
{ {
int o = TsPayloadOffset(*p); if (TsHasPayload(*p)) {
*p += o; int o = TsPayloadOffset(*p);
return TS_SIZE - o; *p += o;
return TS_SIZE - o;
}
return 0;
} }
inline int TsContinuityCounter(const uchar *p) inline int TsContinuityCounter(const uchar *p)