diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-08-01 00:50:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-02 20:58:37 +0100 |
| commit | 6201a6063155a4dc6ad85f67a75eca2c9e0081d9 (patch) | |
| tree | 36bb230daeabbad72bc112b492e207bc4f27079b | |
| parent | 94242dd739a07dca6cf3bb78dc5d7d52dcbdef69 (diff) | |
| download | ffmpeg-6201a6063155a4dc6ad85f67a75eca2c9e0081d9.tar.gz | |
avcodec/indeo2: Check remaining input more often
Fixes: Timeout (95sec -> 30ms)
Fixes: 14765/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_INDEO2_fuzzer-5692455527120896
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpe
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 52939a2c5772ec00101d293695d0a96dcccf99d9)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/indeo2.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c index ce8167b3a2..4a9fb60555 100644 --- a/libavcodec/indeo2.c +++ b/libavcodec/indeo2.c @@ -78,10 +78,11 @@ static int ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *dst for (j = 1; j < height; j++) { out = 0; - if (get_bits_left(&ctx->gb) <= 0) - return AVERROR_INVALIDDATA; while (out < width) { - int c = ir2_get_code(&ctx->gb); + int c; + if (get_bits_left(&ctx->gb) <= 0) + return AVERROR_INVALIDDATA; + c = ir2_get_code(&ctx->gb); if (c >= 0x80) { /* we have a skip */ c -= 0x7F; if (out + c*2 > width) @@ -122,9 +123,9 @@ static int ir2_decode_plane_inter(Ir2Context *ctx, int width, int height, uint8_ for (j = 0; j < height; j++) { out = 0; - if (get_bits_left(&ctx->gb) <= 0) - return AVERROR_INVALIDDATA; while (out < width) { + if (get_bits_left(&ctx->gb) <= 0) + return AVERROR_INVALIDDATA; c = ir2_get_code(&ctx->gb); if (c >= 0x80) { /* we have a skip */ c -= 0x7F; |