summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-08-12 21:17:04 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-08-15 01:26:21 +0200
commitc812db814ebd603106220854e343558ec1115e57 (patch)
tree488747f3dc083d3afb6906a7831273367d900804
parentdf7e79a5c31efa5bd8ced01d7145ca6fc1dc1bc3 (diff)
downloadffmpeg-streaming-c812db814ebd603106220854e343558ec1115e57.zip
ffmpeg-streaming-c812db814ebd603106220854e343558ec1115e57.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>
-rw-r--r--libavcodec/loco.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/loco.c b/libavcodec/loco.c
index 5fb414b..d8bf68a 100644
--- a/libavcodec/loco.c
+++ b/libavcodec/loco.c
@@ -161,6 +161,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++) {
OpenPOWER on IntegriCloud