| Message ID | 20200927075551.30377-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | 6949df35d0c69ae91bb0f49069e0703deb9bd676 |
| Headers | show |
| Series | [FFmpeg-devel,1/3] avcodec/exr: Check xdelta, ydelta | expand |
| Context | Check | Description |
|---|---|---|
| andriy/default | pending | |
| andriy/make | success | Make finished |
| andriy/make_fate | success | Make fate finished |
On Sun, Sep 27, 2020 at 09:55:49AM +0200, Michael Niedermayer wrote: > Fixes: assertion failure > Fixes: 25617/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-5648746061496320 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/exr.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) will apply [...]
diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 216d216785..c80e8eb5e0 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1751,7 +1751,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, /* Verify the xmin, xmax, ymin and ymax before setting the actual image size. * It's possible for the data window can larger or outside the display window */ - if (s->xmin > s->xmax || s->ymin > s->ymax) { + if (s->xmin > s->xmax || s->ymin > s->ymax || + s->ydelta == 0xFFFFFFFF || s->xdelta == 0xFFFFFFFF) { av_log(avctx, AV_LOG_ERROR, "Wrong or missing size information.\n"); return AVERROR_INVALIDDATA; }
Fixes: assertion failure Fixes: 25617/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-5648746061496320 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/exr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)