summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-22 14:00:53 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-22 14:00:53 +0100
commit642c49c983df2f56b656ce668f2a0257a1939578 (patch)
tree5bcf12022ba1b81c2785b45a8664d28023936932
parent48214956b2f115e9cadfcdf1ff06a2477c87a295 (diff)
avcodec/libaacplus: Check for av_malloc() failure
Fixes CID1271046 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/libaacplus.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/libaacplus.c b/libavcodec/libaacplus.c
index 545e240ca6..9087d00635 100644
--- a/libavcodec/libaacplus.c
+++ b/libavcodec/libaacplus.c
@@ -82,6 +82,10 @@ static av_cold int aacPlus_encode_init(AVCodecContext *avctx)
if (aacplusEncGetDecoderSpecificInfo(s->aacplus_handle, &buffer,
&decoder_specific_info_size) == 1) {
avctx->extradata = av_malloc(decoder_specific_info_size + FF_INPUT_BUFFER_PADDING_SIZE);
+ if (!avctx->extradata) {
+ free(buffer);
+ return AVERROR(ENOMEM);
+ }
avctx->extradata_size = decoder_specific_info_size;
memcpy(avctx->extradata, buffer, avctx->extradata_size);
}