summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-18 20:50:23 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-22 12:27:25 +0200
commit455bc87c8f00abbcb2dd305b677bbe56140bd5f4 (patch)
tree02c64b17f7e95e2dfa6c2145351b364efb036188
parentbfd65092a2b7fc1ae95e8fe79c7f0a61f25b111b (diff)
downloadffmpeg-455bc87c8f00abbcb2dd305b677bbe56140bd5f4.tar.gz
avcodec/alsdec: Use av_mallocz_array() for chan_data to ensure the arrays never contain random data
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 7e104647a3556fc61a139483cee1cb7dfa2dc5bd) Conflicts: libavcodec/alsdec.c
-rw-r--r--libavcodec/alsdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index c0367d4ba2..fa93b75c88 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -1719,9 +1719,9 @@ static av_cold int decode_init(AVCodecContext *avctx)
// allocate and assign channel data buffer for mcc mode
if (sconf->mc_coding) {
- ctx->chan_data_buffer = av_malloc(sizeof(*ctx->chan_data_buffer) *
+ ctx->chan_data_buffer = av_mallocz(sizeof(*ctx->chan_data_buffer) *
num_buffers * num_buffers);
- ctx->chan_data = av_malloc(sizeof(*ctx->chan_data) *
+ ctx->chan_data = av_mallocz(sizeof(*ctx->chan_data) *
num_buffers);
ctx->reverted_channels = av_malloc(sizeof(*ctx->reverted_channels) *
num_buffers);