virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity

avcodec/bethsoftvideo: Check block_type before frame alloc

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2022-08-18 22:26:38 +02:00
parent e1c0239d5a
commit d93dccdc9f
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/bethsoftvideo.c
View File

@ -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) {