diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2022-08-18 22:26:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2022-08-28 22:06:43 +0200 |
| commit | d93dccdc9f6fa41dc5ef743bc195c4fc052a34b4 (patch) | |
| tree | 9f741fc81d80b60e2fdc8187c3080695b97376b6 | |
| parent | e1c0239d5a17f3cbcd69c339ec3eb4917f1f7ddf (diff) | |
| download | ffmpeg-d93dccdc9f6fa41dc5ef743bc195c4fc052a34b4.tar.gz | |
avcodec/bethsoftvideo: Check block_type before frame alloc
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/bethsoftvideo.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c index 9fbfc3db4f..4562053829 100644 --- a/libavcodec/bethsoftvideo.c +++ b/libavcodec/bethsoftvideo.c @@ -79,6 +79,11 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx, AVFrame *rframe, int code, ret; int yoffset; + bytestream2_init(&vid->g, avpkt->data, avpkt->size); + block_type = bytestream2_get_byte(&vid->g); + if (block_type < 1 || block_type > 4) + return AVERROR_INVALIDDATA; + if ((ret = ff_reget_buffer(avctx, vid->frame, 0)) < 0) return ret; wrap_to_next_line = vid->frame->linesize[0] - avctx->width; @@ -92,11 +97,10 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx, AVFrame *rframe, return ret; } - bytestream2_init(&vid->g, avpkt->data, avpkt->size); dst = vid->frame->data[0]; frame_end = vid->frame->data[0] + vid->frame->linesize[0] * avctx->height; - switch(block_type = bytestream2_get_byte(&vid->g)){ + switch(block_type){ case PALETTE_BLOCK: { *got_frame = 0; if ((ret = set_palette(vid, &vid->g)) < 0) { |