ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/cri: check for available input in unpack_10bit()

Browse Source 
Fixes: Timeout (>20sec -> 56ms)
Fixes: 26995/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CRI_fuzzer-5107217080254464

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2020-11-09 23:31:30 +01:00
parent 1b373b41d9
commit 43c8d3097b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/cri.c
View File

@ -80,10 +80,13 @@ static void unpack_10bit(GetByteContext *gb, uint16_t *dst, int shift,
int pos = 0;
while (count > 0) {
uint32_t a0 = bytestream2_get_le32(gb);
uint32_t a1 = bytestream2_get_le32(gb);
uint32_t a2 = bytestream2_get_le32(gb);
uint32_t a3 = bytestream2_get_le32(gb);
uint32_t a0, a1,a2,a3;
if (bytestream2_get_bytes_left(gb) < 4)
break;
a0 = bytestream2_get_le32(gb);
a1 = bytestream2_get_le32(gb);
a2 = bytestream2_get_le32(gb);
a3 = bytestream2_get_le32(gb);
dst[pos] = (((a0 >> 1) & 0xE00) | (a0 & 0x1FF)) << shift;
pos++;
if (pos >= w) {