[FFmpeg-cvslog] avcodec/sonic: Check init_get_bits8() for failure
Michael Niedermayer
git at videolan.org
Fri Sep 4 03:39:47 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri Sep 4 01:18:13 2015 +0200| [6ae1a32d8ac7b20099b35ff376ac92dd793b1852] | committer: Michael Niedermayer
avcodec/sonic: Check init_get_bits8() for failure
Fixes: CID1322310
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6ae1a32d8ac7b20099b35ff376ac92dd793b1852
---
libavcodec/sonic.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c
index 4506379..4ec7d89 100644
--- a/libavcodec/sonic.c
+++ b/libavcodec/sonic.c
@@ -858,6 +858,7 @@ static av_cold int sonic_decode_init(AVCodecContext *avctx)
SonicContext *s = avctx->priv_data;
GetBitContext gb;
int i;
+ int ret;
s->channels = avctx->channels;
s->samplerate = avctx->sample_rate;
@@ -868,7 +869,9 @@ static av_cold int sonic_decode_init(AVCodecContext *avctx)
return AVERROR_INVALIDDATA;
}
- init_get_bits8(&gb, avctx->extradata, avctx->extradata_size);
+ ret = init_get_bits8(&gb, avctx->extradata, avctx->extradata_size);
+ if (ret < 0)
+ return ret;
s->version = get_bits(&gb, 2);
if (s->version >= 2) {
More information about the ffmpeg-cvslog
mailing list