projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
fe0f4e5
)
aac_adtstoasc_bsf: Check extradata memory allocation
author
Himangi Saraogi
<himangi774@gmail.com>
Tue, 10 Feb 2015 22:07:40 +0000
(
03:37
+0530)
committer
Vittorio Giovara
<vittorio.giovara@gmail.com>
Tue, 17 Feb 2015 17:18:10 +0000
(12:18 -0500)
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
libavcodec/aac_adtstoasc_bsf.c
patch
|
blob
|
history
diff --git
a/libavcodec/aac_adtstoasc_bsf.c
b/libavcodec/aac_adtstoasc_bsf.c
index
733b08d
..
bedaa49
100644
(file)
--- a/
libavcodec/aac_adtstoasc_bsf.c
+++ b/
libavcodec/aac_adtstoasc_bsf.c
@@
-89,6
+89,8
@@
static int aac_adtstoasc_filter(AVBitStreamFilterContext *bsfc,
}
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);