]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/h2645_parse: Reduce the initial skipped_bytes_pos size with small inputs
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 12 Dec 2020 15:36:04 +0000 (16:36 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 1 Mar 2021 19:19:15 +0000 (20:19 +0100)
Fixes: OOM
Fixes: 23817/clusterfuzz-testcase-minimized-ffmpeg_BSF_H264_METADATA_fuzzer-6300869057576960
Fixes: 28055/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5706035297517568
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/h2645_parse.c

index a36ef4f5a002b7d891f2e5eb1fe8dcf2ae2b0972..6fbe97ad4aac237f01a6b8f629212be6c2d1fb27 100644 (file)
@@ -467,7 +467,7 @@ int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length,
             memset(pkt->nals + pkt->nals_allocated, 0, sizeof(*pkt->nals));
 
             nal = &pkt->nals[pkt->nb_nals];
-            nal->skipped_bytes_pos_size = 1024; // initial buffer size
+            nal->skipped_bytes_pos_size = FFMIN(1024, extract_length/3+1); // initial buffer size
             nal->skipped_bytes_pos = av_malloc_array(nal->skipped_bytes_pos_size, sizeof(*nal->skipped_bytes_pos));
             if (!nal->skipped_bytes_pos)
                 return AVERROR(ENOMEM);