diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 22:54:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 22:55:27 +0100 |
| commit | 38e867f6c08ed421840bb29337351db59d8e4f86 (patch) | |
| tree | 9207a34fc3308d5977c363c5be32bc94c3f36c5c /libavcodec | |
| parent | 62aec0c2d5b3ee55dc376279307e31f0d72a7b03 (diff) | |
| parent | 18f4fa251b0eb36392839f5bf6180f280dc04d8d (diff) | |
Merge commit '18f4fa251b0eb36392839f5bf6180f280dc04d8d'
* commit '18f4fa251b0eb36392839f5bf6180f280dc04d8d':
aac_adtstoasc_bsf: Check extradata memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aac_adtstoasc_bsf.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/aac_adtstoasc_bsf.c b/libavcodec/aac_adtstoasc_bsf.c index b1515fdcd0..8c5d580b02 100644 --- a/libavcodec/aac_adtstoasc_bsf.c +++ b/libavcodec/aac_adtstoasc_bsf.c @@ -90,6 +90,8 @@ static int aac_adtstoasc_filter(AVBitStreamFilterContext *bsfc, av_free(avctx->extradata); avctx->extradata_size = 2 + pce_size; avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); + if (!avctx->extradata) + return AVERROR(ENOMEM); init_put_bits(&pb, avctx->extradata, avctx->extradata_size); put_bits(&pb, 5, hdr.object_type); |