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

Checking the remaining packet length after processing the pointer field

Browse Source
This commit is contained in:
Klaus Schmidinger 2009-01-23 14:34:05 +01:00
parent a1e7922938
commit 4895d6b9e2
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -5947,3 +5947,6 @@ Video Disk Recorder Revision History
Nissl for pointing this out). Nissl for pointing this out).
- Fixed handling the pointer field in cPatPmtParser::ParsePmt() (thanks to Frank - Fixed handling the pointer field in cPatPmtParser::ParsePmt() (thanks to Frank
Schmirler - sorry I swapped two lines whan adopting the original patch). Schmirler - sorry I swapped two lines whan adopting the original patch).
- Checking the remaining packet length after processing the pointer field in
cPatPmtParser::ParsePat() and cPatPmtParser::ParsePmt() (suggested by Frank
Schmirler).

7
remux.c
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.c 2.8 2009/01/23 14:17:07 kls Exp $ * $Id: remux.c 2.9 2009/01/23 14:31:43 kls Exp $
*/ */
#include "remux.h" #include "remux.h"
@ -338,6 +338,8 @@ cPatPmtParser::cPatPmtParser(void)
void cPatPmtParser::ParsePat(const uchar *Data, int Length) void cPatPmtParser::ParsePat(const uchar *Data, int Length)
{ {
// The PAT is always assumed to fit into a single TS packet // The PAT is always assumed to fit into a single TS packet
if ((Length -= Data[0] + 1) <= 0)
return;
Data += Data[0] + 1; // process pointer_field Data += Data[0] + 1; // process pointer_field
SI::PAT Pat(Data, false); SI::PAT Pat(Data, false);
if (Pat.CheckCRCAndParse()) { if (Pat.CheckCRCAndParse()) {
@ -359,7 +361,8 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
{ {
// The PMT may extend over several TS packets, so we need to assemble them // The PMT may extend over several TS packets, so we need to assemble them
if (pmtSize == 0) { if (pmtSize == 0) {
Length -= Data[0] + 1; if ((Length -= Data[0] + 1) <= 0)
return;
Data += Data[0] + 1; // this is the first packet Data += Data[0] + 1; // this is the first packet
if (SectionLength(Data, Length) > Length) { if (SectionLength(Data, Length) > Length) {
if (Length <= int(sizeof(pmt))) { if (Length <= int(sizeof(pmt))) {