har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/loco: Check for end of input in pixel decode

Browse Source 
Fixes: Timeout (100sec -> 5sec)
Fixes: 15509/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LOCO_fuzzer-5724297261219840

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-08-02 22:14:22 +02:00
parent 549fcba8fc
commit 8305a4509a
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/loco.c
View File

@ -88,6 +88,8 @@ static inline int loco_get_rice(RICEContext *r)
loco_update_rice_param(r, 0); loco_update_rice_param(r, 0);
return 0; return 0;
} }
if (get_bits_left(&r->gb) < 1)
return INT_MIN;
v = get_ur_golomb_jpegls(&r->gb, loco_get_rice_param(r), INT_MAX, 0); v = get_ur_golomb_jpegls(&r->gb, loco_get_rice_param(r), INT_MAX, 0);
loco_update_rice_param(r, (v + 1) >> 1); loco_update_rice_param(r, (v + 1) >> 1);
if (!v) { if (!v) {
@ -163,6 +165,8 @@ static int loco_decode_plane(LOCOContext *l, uint8_t *data, int width, int heigh
/* restore all other pixels */ /* restore all other pixels */
for (i = 1; i < width; i++) { for (i = 1; i < width; i++) {
val = loco_get_rice(&rc); val = loco_get_rice(&rc);
if (val == INT_MIN)
return -1;
data[i] = loco_predict(&data[i], stride) + val; data[i] = loco_predict(&data[i], stride) + val;
} }
data += stride; data += stride;