mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '71953ebcf94fe4ef316cdad1f276089205dd1d65'
* commit '71953ebcf94fe4ef316cdad1f276089205dd1d65':
aac: Check init_get_bits return value
Conflicts:
libavcodec/aacdec.c
See: 73abc3a634
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
48af87819a
|
@ -2766,7 +2766,8 @@ static int aac_decode_frame(AVCodecContext *avctx, void *data,
|
|||
if (INT_MAX / 8 <= buf_size)
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
init_get_bits(&gb, buf, buf_size * 8);
|
||||
if ((err = init_get_bits(&gb, buf, buf_size * 8)) < 0)
|
||||
return err;
|
||||
|
||||
if ((err = aac_decode_frame_int(avctx, data, got_frame_ptr, &gb, avpkt)) < 0)
|
||||
return err;
|
||||
|
|
Loading…
Reference in New Issue