diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-05-28 14:33:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-07-05 12:43:08 +0200 |
| commit | 6b58eaac4ddc36d46bb4611efede18f0a9a530d1 (patch) | |
| tree | 79214043f596fda2bf9d6dbd6b5ea42269217105 | |
| parent | a317af2debd596fd11dc2e487f7cd145a0b985da (diff) | |
| download | ffmpeg-6b58eaac4ddc36d46bb4611efede18f0a9a530d1.tar.gz | |
avcodec/h264dec: Disable forced small_padding on flag2 fast
Fixes: 20978/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_H264_fuzzer-5746381832847360
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/h264.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 4fc2aed302..1f399ab838 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -293,12 +293,9 @@ const uint8_t *ff_h264_decode_nal(H264Context *h, H264SliceContext *sl, if(i>=length-1){ //no escaped 0 *dst_length= length; *consumed= length+1; //+1 for the header - if(h->avctx->flags2 & AV_CODEC_FLAG2_FAST){ - return src; - }else{ - memcpy(dst, src, length); - return dst; - } + + memcpy(dst, src, length); + return dst; } memcpy(dst, src, i); |