diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2019-08-12 21:17:04 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-11-11 20:18:47 +0100 |
commit | f01618f84b34f23156bd05e1d9211b274a6ec9f5 (patch) | |
tree | 3aaba66e288a42795dfbb5a98fa3bb22b6c4dc87 /libavcodec | |
parent | a4ee3561899706f383c7c17b21bf762842ed565b (diff) | |
download | ffmpeg-f01618f84b34f23156bd05e1d9211b274a6ec9f5.tar.gz |
avcodec/loco: Check left column value
Fixes: Timeout (42sec -> 379 ms)
Fixes: 16323/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LOCO_fuzzer-5679178099195904
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>
(cherry picked from commit c812db814ebd603106220854e343558ec1115e57)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/loco.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/loco.c b/libavcodec/loco.c index 9a309fd063..e3746c8317 100644 --- a/libavcodec/loco.c +++ b/libavcodec/loco.c @@ -159,6 +159,8 @@ static int loco_decode_plane(LOCOContext *l, uint8_t *data, int width, int heigh for (j = 1; j < height; j++) { /* restore left column */ val = loco_get_rice(&rc); + if (val == INT_MIN) + return AVERROR_INVALIDDATA; data[0] = data[-stride] + val; /* restore all other pixels */ for (i = 1; i < width; i++) { |