aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormaryam ebrahimzadeh <me22bee@outlook.com>2021-08-04 16:15:18 -0400
committerMichael Niedermayer <michael@niedermayer.cc>2021-09-08 21:31:50 +0200
commitfb993619d1035fa9646506925ea70fb122038999 (patch)
treea460bcca76ac9a9d9f37025d9b3882f99fcc783a
parent671e182cc46e73a0b63c3d1f35efab12405f8ea5 (diff)
downloadffmpeg-fb993619d1035fa9646506925ea70fb122038999.tar.gz
avformat/adtsenc: return value check for init_get_bits in adts_decode_extradata
As the second argument for init_get_bits (buf) can be crafted, a return value check for this function call is necessary. 'buf' is part of 'AVPacket pkt'. replace init_get_bits with init_get_bits8. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 9ffa49496d1aae4cbbb387aac28a9e061a6ab0a6) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/adtsenc.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c
index 3595cb3bb2..c35a12a628 100644
--- a/libavformat/adtsenc.c
+++ b/libavformat/adtsenc.c
@@ -51,9 +51,11 @@ static int adts_decode_extradata(AVFormatContext *s, ADTSContext *adts, const ui
GetBitContext gb;
PutBitContext pb;
MPEG4AudioConfig m4ac;
- int off;
+ int off, ret;
- init_get_bits(&gb, buf, size * 8);
+ ret = init_get_bits8(&gb, buf, size);
+ if (ret < 0)
+ return ret;
off = avpriv_mpeg4audio_get_config2(&m4ac, buf, size, 1, s);
if (off < 0)
return off;