From 83a940e7fb9640954d631870e2ec6e8b3fc528ed Mon Sep 17 00:00:00 2001 From: Hendrik Leppkes Date: Thu, 7 Jul 2016 20:19:51 +0200 Subject: [PATCH] h2645_parse: don't overread AnnexB NALs within an avc stream We know the maximum size of an AnnexB NAL, signaling it as the maximum NAL size allows ff_h2645_extract_rbsp to determine the correct size. --- libavcodec/h2645_parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c index 26f2e85ab8..ef872fe88c 100644 --- a/libavcodec/h2645_parse.c +++ b/libavcodec/h2645_parse.c @@ -293,7 +293,7 @@ int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length, buf += 3; length -= 3; - extract_length = length; + extract_length = FFMIN(length, next_avc - buf); if (buf >= next_avc) { /* skip to the start of the next NAL */