From 5a0a9f78252825dfe1824eedbc373aea443e5e77 Mon Sep 17 00:00:00 2001 From: Nicolas Jorge Dato Date: Wed, 15 Sep 2021 09:58:11 -0300 Subject: avformat/mpegts: fixes overflow when parsing the PMT When a possible overflow was detected, there was a break to exit the while loop. However, it should have already substracted 2 bytes from program_info_length (descriptor ID + length). Fixes ticket #9422. Signed-off-by: Marton Balint --- libavformat/mpegts.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libavformat') diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index ed918cb356..da8eee2414 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2355,10 +2355,11 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len av_log(ts->stream, AV_LOG_TRACE, "program tag: 0x%02x len=%d\n", tag, len); - if (len > program_info_length - 2) + program_info_length -= 2; + if (len > program_info_length) // something else is broken, exit the program_descriptors_loop break; - program_info_length -= len + 2; + program_info_length -= len; if (tag == IOD_DESCRIPTOR) { get8(&p, p_end); // scope get8(&p, p_end); // label -- cgit v1.2.3