virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/escape124: Fix some return codes

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2023-03-05 22:37:44 +01:00
parent 87ad0a5dd7
commit 98df605f7a
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/escape124.c
View File

@@ -89,11 +89,6 @@ static CodeBook unpack_codebook(GetBitContext* gb, unsigned depth,
unsigned i, j; unsigned i, j;
CodeBook cb = { 0 }; CodeBook cb = { 0 };
if (size >= INT_MAX / 34 || get_bits_left(gb) < (int)size * 34)
return cb;
if (size >= INT_MAX / sizeof(MacroBlock))
return cb;
cb.blocks = av_malloc(size ? size * sizeof(MacroBlock) : 1); cb.blocks = av_malloc(size ? size * sizeof(MacroBlock) : 1);
if (!cb.blocks) if (!cb.blocks)
return cb; return cb;
@@ -225,7 +220,7 @@ static int escape124_decode_frame(AVCodecContext *avctx, AVFrame *frame,
// represent a lower bound of the space needed for skipped superblocks. Non // represent a lower bound of the space needed for skipped superblocks. Non
// skipped SBs need more space. // skipped SBs need more space.
if (get_bits_left(&gb) < 64 + s->num_superblocks * 23LL / 4320) if (get_bits_left(&gb) < 64 + s->num_superblocks * 23LL / 4320)
return -1; return AVERROR_INVALIDDATA;
frame_flags = get_bits_long(&gb, 32); frame_flags = get_bits_long(&gb, 32);
frame_size = get_bits_long(&gb, 32); frame_size = get_bits_long(&gb, 32);
@@ -276,9 +271,14 @@ static int escape124_decode_frame(AVCodecContext *avctx, AVFrame *frame,
} }
av_freep(&s->codebooks[i].blocks); av_freep(&s->codebooks[i].blocks);
if (cb_size >= INT_MAX / 34 || get_bits_left(&gb) < (int)cb_size * 34)
return AVERROR_INVALIDDATA;
if (cb_size >= INT_MAX / sizeof(MacroBlock))
return AVERROR_INVALIDDATA;
s->codebooks[i] = unpack_codebook(&gb, cb_depth, cb_size); s->codebooks[i] = unpack_codebook(&gb, cb_depth, cb_size);
if (!s->codebooks[i].blocks) if (!s->codebooks[i].blocks)
return -1; return AVERROR(ENOMEM);
} }
} }