diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-05-30 05:25:06 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-05-31 12:17:06 +0200 |
| commit | 45c350226696be9deae7c73d67fdc93f848f9a91 (patch) | |
| tree | acc45637d964eeb2e28c382c3c16fa1674e467f1 | |
| parent | 4aa07d1a74289dcdf12ea65ac975b415e26e3801 (diff) | |
| download | ffmpeg-45c350226696be9deae7c73d67fdc93f848f9a91.tar.gz | |
avcodec/anm: Check extradata length before allocating frame
Then one doesn't need to free the frame in case the length turns out to
be insufficient.
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | libavcodec/anm.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavcodec/anm.c b/libavcodec/anm.c index cd1fcc5998..e9b19d880d 100644 --- a/libavcodec/anm.c +++ b/libavcodec/anm.c @@ -40,6 +40,9 @@ static av_cold int decode_init(AVCodecContext *avctx) AnmContext *s = avctx->priv_data; int i; + if (avctx->extradata_size < 16 * 8 + 4 * 256) + return AVERROR_INVALIDDATA; + avctx->pix_fmt = AV_PIX_FMT_PAL8; s->frame = av_frame_alloc(); @@ -47,11 +50,6 @@ static av_cold int decode_init(AVCodecContext *avctx) return AVERROR(ENOMEM); bytestream2_init(&s->gb, avctx->extradata, avctx->extradata_size); - if (bytestream2_get_bytes_left(&s->gb) < 16 * 8 + 4 * 256) { - av_frame_free(&s->frame); - return AVERROR_INVALIDDATA; - } - bytestream2_skipu(&s->gb, 16 * 8); for (i = 0; i < 256; i++) s->palette[i] = (0xFFU << 24) | bytestream2_get_le32u(&s->gb); |