projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d81913e
)
tools/target_dec_fuzzer: Limit error concealment on pixels instead of just frames
author
Michael Niedermayer
<michael@niedermayer.cc>
Thu, 16 May 2019 22:23:54 +0000
(
00:23
+0200)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Wed, 5 Jun 2019 11:19:59 +0000
(13:19 +0200)
This should reduce the amount of timeout issues overall
Fixes: Timeout (34->10sec)
Fixes: 14682/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMV2_fuzzer-
5728608414334976
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tools/target_dec_fuzzer.c
patch
|
blob
|
history
diff --git
a/tools/target_dec_fuzzer.c
b/tools/target_dec_fuzzer.c
index
2a6d525
..
4f51b70
100644
(file)
--- a/
tools/target_dec_fuzzer.c
+++ b/
tools/target_dec_fuzzer.c
@@
-137,6
+137,7
@@
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
const uint8_t *last = data;
const uint8_t *end = data + size;
uint32_t it = 0;
+ uint64_t ec_pixels = 0;
int (*decode_handler)(AVCodecContext *avctx, AVFrame *picture,
int *got_picture_ptr,
const AVPacket *avpkt) = NULL;
@@
-244,7
+245,8
@@
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
av_frame_unref(frame);
int ret = decode_handler(ctx, frame, &got_frame, &avpkt);
- if (it > 20)
+ ec_pixels += ctx->width * ctx->height;
+ if (it > 20 || ec_pixels > 4 * ctx->max_pixels)
ctx->error_concealment = 0;
if (ret <= 0 || ret > avpkt.size)