RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-01 22:49:21 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/sga: av_assert1 check init_get_bits8()

Browse Source 
Related: CID1473562 Unchecked return value
Related: CID1473592 Unchecked return value

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2024-08-12 18:20:33 +02:00
parent e40b23c52a
commit 0f4524f07a
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 6 additions and 2 deletions

8
libavcodec/sga.c
View File

@ -254,11 +254,13 @@ static int decode_palmapdata(AVCodecContext *avctx)
const int bits = (s->nb_pal + 1) / 2;
GetByteContext *gb = &s->gb;
GetBitContext pm;
int ret;
bytestream2_seek(gb, s->palmapdata_offset, SEEK_SET);
if (bytestream2_get_bytes_left(gb) < s->palmapdata_size)
return AVERROR_INVALIDDATA;
init_get_bits8(&pm, gb->buffer, s->palmapdata_size);
ret = init_get_bits8(&pm, gb->buffer, s->palmapdata_size);
av_assert1(ret >= 0);
for (int y = 0; y < s->tiles_h; y++) {
uint8_t *dst = s->palmapindex_data + y * s->tiles_w;
@ -277,11 +279,13 @@ static int decode_tiledata(AVCodecContext *avctx)
SGAVideoContext *s = avctx->priv_data;
GetByteContext *gb = &s->gb;
GetBitContext tm;
int ret;
bytestream2_seek(gb, s->tiledata_offset, SEEK_SET);
if (bytestream2_get_bytes_left(gb) < s->tiledata_size)
return AVERROR_INVALIDDATA;
init_get_bits8(&tm, gb->buffer, s->tiledata_size);
ret = init_get_bits8(&tm, gb->buffer, s->tiledata_size);
av_assert1(ret >= 0);
for (int n = 0; n < s->nb_tiles; n++) {
uint8_t *dst = s->tileindex_data + n * 64;