fixed an issue with the PES parser removing too many bytes when parsing stuffing bytes

frejoel · frejoel · commit a7d2800b2a15 · 2017-05-18T00:00:51.000-07:00
diff --git a/src/tsdemux.c b/src/tsdemux.c
@@ -821,6 +821,7 @@ TSDCode tsd_parse_pes(TSDemuxContext *ctx,
         ptr++;
         pes->header_data_length = *ptr;
         ptr++;
+        const uint8_t *header_end = &ptr[pes->header_data_length];
         if(pes->flags & TSD_PPF_PTS_FLAG) {
             uint64_t pts1 = (uint64_t) (((*ptr) >> 1) & 0x07);
             uint64_t pts2 = (uint64_t) ((parse_u16(ptr+1) >> 1) & 0x7FFF);
@@ -952,7 +953,7 @@ TSDCode tsd_parse_pes(TSDemuxContext *ctx,
             }
         }
         // get past any stuffing
-        while(*ptr == 0xFF) {
+        while(ptr < header_end && *ptr == 0xFF) {
             ptr++;
         }
         pes->data_bytes = ptr;

Original file line number	Diff line number	Diff line change
`@@ -821,6 +821,7 @@ TSDCode tsd_parse_pes(TSDemuxContext *ctx,`
`821`	`821`	`ptr++;`
`822`	`822`	`pes->header_data_length = *ptr;`
`823`	`823`	`ptr++;`
	`824`	`+ const uint8_t *header_end = &ptr[pes->header_data_length];`
`824`	`825`	`if(pes->flags & TSD_PPF_PTS_FLAG) {`
`825`	`826`	`uint64_t pts1 = (uint64_t) (((*ptr) >> 1) & 0x07);`
`826`	`827`	`uint64_t pts2 = (uint64_t) ((parse_u16(ptr+1) >> 1) & 0x7FFF);`
`@@ -952,7 +953,7 @@ TSDCode tsd_parse_pes(TSDemuxContext *ctx,`
`952`	`953`	`}`
`953`	`954`	`}`
`954`	`955`	`// get past any stuffing`
`955`		`- while(*ptr == 0xFF) {`
	`956`	`+ while(ptr < header_end && *ptr == 0xFF) {`
`956`	`957`	`ptr++;`
`957`	`958`	`}`
`958`	`959`	`pes->data_bytes = ptr;`