h2645_parse: don't overread AnnexB NALs within an avc stream
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 7 Jul 2016 18:19:51 +0000 (20:19 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 8 Jul 2016 13:20:20 +0000 (15:20 +0200)
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

index 26f2e85..ef872fe 100644 (file)
@@ -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 */