Browse Source

avcodec/gdv: Error out if we had insufficent input for the output frame in decompress_2()

Fixes: Timeout (with the previous commits to gdv.c)
Fixes: 9422/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_GDV_fuzzer-5143490001371136

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n4.1
Michael Niedermayer 7 years ago
parent
commit
35517e3ca7
1 changed files with 6 additions and 0 deletions
  1. +6
    -0
      libavcodec/gdv.c

+ 6
- 0
libavcodec/gdv.c View File

@@ -230,6 +230,10 @@ static int decompress_2(AVCodecContext *avctx)
break;
}
}

if (bytestream2_get_bytes_left_p(pb) > 0)
return AVERROR_INVALIDDATA;

return 0;
}

@@ -458,6 +462,8 @@ static int gdv_decode_frame(AVCodecContext *avctx, void *data,
default:
av_assert0(0);
}
if (ret < 0)
return ret;

memcpy(frame->data[1], gdv->pal, AVPALETTE_SIZE);
dst = frame->data[0];


Loading…
Cancel
Save