diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-08-26 23:09:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-09-03 00:01:32 +0200 |
| commit | c5e574a0d0f9a849fdc9e6a779f733eddc048596 (patch) | |
| tree | a37320ac38c4174cd41d4fee36091470d9f4b133 | |
| parent | 0c88a5d3eb8cd6891a52eb285b37b1458f0b4b16 (diff) | |
| download | ffmpeg-c5e574a0d0f9a849fdc9e6a779f733eddc048596.tar.gz | |
avcodec/ffv1dec_template: do not ignore the return code of decode_line()
Fixes: Timeout
Fixes: 9710/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFV1_fuzzer-4918894635515904
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/ffv1dec_template.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libavcodec/ffv1dec_template.c b/libavcodec/ffv1dec_template.c index f8a42a6d44..fecdbd0025 100644 --- a/libavcodec/ffv1dec_template.c +++ b/libavcodec/ffv1dec_template.c @@ -107,7 +107,7 @@ static av_always_inline int RENAME(decode_line)(FFV1Context *s, int w, return 0; } -static void RENAME(decode_rgb_frame)(FFV1Context *s, uint8_t *src[4], int w, int h, int stride[4]) +static int RENAME(decode_rgb_frame)(FFV1Context *s, uint8_t *src[4], int w, int h, int stride[4]) { int x, y, p; TYPE *sample[4][2]; @@ -127,6 +127,7 @@ static void RENAME(decode_rgb_frame)(FFV1Context *s, uint8_t *src[4], int w, int for (y = 0; y < h; y++) { for (p = 0; p < 3 + transparency; p++) { + int ret; TYPE *temp = sample[p][0]; // FIXME: try a normal buffer sample[p][0] = sample[p][1]; @@ -135,9 +136,11 @@ static void RENAME(decode_rgb_frame)(FFV1Context *s, uint8_t *src[4], int w, int sample[p][1][-1]= sample[p][0][0 ]; sample[p][0][ w]= sample[p][0][w-1]; if (lbd && s->slice_coding_mode == 0) - RENAME(decode_line)(s, w, sample[p], (p + 1)/2, 9); + ret = RENAME(decode_line)(s, w, sample[p], (p + 1)/2, 9); else - RENAME(decode_line)(s, w, sample[p], (p + 1)/2, bits + (s->slice_coding_mode != 1)); + ret = RENAME(decode_line)(s, w, sample[p], (p + 1)/2, bits + (s->slice_coding_mode != 1)); + if (ret < 0) + return ret; } for (x = 0; x < w; x++) { int g = sample[0][1][x]; @@ -168,4 +171,5 @@ static void RENAME(decode_rgb_frame)(FFV1Context *s, uint8_t *src[4], int w, int } } } + return 0; } |