virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/wmaprodec: return value check for init_get_bits

Browse Source 
Also replace init_get_bits with init_get_bits8().
This commit is contained in:
maryam ebrahimzadeh
2021-08-27 02:40:14 -04:00
committed by Paul B Mahol
parent 8c1b65feb6
commit 2c0d522963
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/wmaprodec.c
View File

@@ -1618,6 +1618,7 @@ static int decode_packet(AVCodecContext *avctx, WMAProDecodeCtx *s,
int buf_size = avpkt->size; int buf_size = avpkt->size;
int num_bits_prev_frame; int num_bits_prev_frame;
int packet_sequence_number; int packet_sequence_number;
int ret;
*got_frame_ptr = 0; *got_frame_ptr = 0;
@@ -1669,7 +1670,9 @@ static int decode_packet(AVCodecContext *avctx, WMAProDecodeCtx *s,
s->buf_bit_size = buf_size << 3; s->buf_bit_size = buf_size << 3;
/** parse packet header */ /** parse packet header */
init_get_bits(gb, buf, s->buf_bit_size); ret = init_get_bits8(gb, buf, buf_size);
if (ret < 0)
return ret;
if (avctx->codec_id != AV_CODEC_ID_XMA2) { if (avctx->codec_id != AV_CODEC_ID_XMA2) {
packet_sequence_number = get_bits(gb, 4); packet_sequence_number = get_bits(gb, 4);
skip_bits(gb, 2); skip_bits(gb, 2);
@@ -1737,7 +1740,9 @@ static int decode_packet(AVCodecContext *avctx, WMAProDecodeCtx *s,
} }
s->buf_bit_size = (avpkt->size - s->next_packet_start) << 3; s->buf_bit_size = (avpkt->size - s->next_packet_start) << 3;
init_get_bits(gb, avpkt->data, s->buf_bit_size); ret = init_get_bits8(gb, avpkt->data, avpkt->size - s->next_packet_start);
if (ret < 0)
return ret;
skip_bits(gb, s->packet_offset); skip_bits(gb, s->packet_offset);
if (s->len_prefix && remaining_bits(s, gb) > s->log2_frame_size && if (s->len_prefix && remaining_bits(s, gb) > s->log2_frame_size &&
(frame_size = show_bits(gb, s->log2_frame_size)) && (frame_size = show_bits(gb, s->log2_frame_size)) &&