From 2e786bc4989835f6d82cc187c4bb37716521a0bf Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 17 Feb 2015 22:58:31 +0100 Subject: [PATCH] avcodec/aac_adtstoasc_bsf: Clear extradata_size on allocation failure This keeps the fields consistent Signed-off-by: Michael Niedermayer --- libavcodec/aac_adtstoasc_bsf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/aac_adtstoasc_bsf.c b/libavcodec/aac_adtstoasc_bsf.c index 8c5d580b02..1f11d02499 100644 --- a/libavcodec/aac_adtstoasc_bsf.c +++ b/libavcodec/aac_adtstoasc_bsf.c @@ -90,8 +90,10 @@ 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) + if (!avctx->extradata) { + avctx->extradata_size = 0; return AVERROR(ENOMEM); + } init_put_bits(&pb, avctx->extradata, avctx->extradata_size); put_bits(&pb, 5, hdr.object_type);