summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mpeg.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index 462ef73bc4..480c0541ca 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -341,12 +341,13 @@ static int mpegps_read_pes_header(AVFormatContext *s,
if (flags & 0x01) { /* PES extension */
pes_ext = get_byte(s->pb);
header_len--;
- if (pes_ext & 0x40) { /* pack header - should be zero in PS */
- goto error_redo;
- }
/* Skip PES private data, program packet sequence counter and P-STD buffer */
skip = (pes_ext >> 4) & 0xb;
skip += skip & 0x9;
+ if (pes_ext & 0x40 || skip > header_len){
+ av_log(s, AV_LOG_WARNING, "pes_ext %X is invalid\n", pes_ext);
+ pes_ext=skip=0;
+ }
url_fskip(s->pb, skip);
header_len -= skip;