summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2015-04-18 20:50:23 +0200
committerMichael Niedermayer <[email protected]>2015-05-15 10:04:50 +0200
commit33862c1f6ddc778adf23837e0f4ff7ec363096c9 (patch)
treefc5c725543c44cdd8d5c1684840340048ef771be
parent89fbae7686ab3c49bc61bcb9352fbba9bcbc1400 (diff)
avcodec/alsdec: Use av_mallocz_array() for chan_data to ensure the arrays never contain random data
Signed-off-by: Michael Niedermayer <[email protected]> (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 d9fcb1a0bc..6b4dab1e35 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -1766,9 +1766,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);