From: Anton Khirnov <anton@khirnov.net>
Date: Mon, 16 Dec 2013 17:20:41 +0000 (+0100)
Subject: audio_mix: initialize the data pointers to NULL
X-Git-Tag: android-x86-6.0-r1~10^2~2451
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3d95d27376e59de14f984e7a22a52e066d85df35;p=android-x86%2Fexternal-ffmpeg.git

audio_mix: initialize the data pointers to NULL

This should make it easier to catch problems where some of those
pointers are used uninitialized, since reading from NULL should always
crash, while random numbers from stack can turn out to be valid
pointers, so random memory may be silently overwritten.
---

diff --git a/libavresample/audio_mix.c b/libavresample/audio_mix.c
index 073609e7ee..765bc73441 100644
--- a/libavresample/audio_mix.c
+++ b/libavresample/audio_mix.c
@@ -447,7 +447,7 @@ int ff_audio_mix(AudioMix *am, AudioData *src)
 
     if (am->in_matrix_channels && am->out_matrix_channels) {
         uint8_t **data;
-        uint8_t *data0[AVRESAMPLE_MAX_CHANNELS];
+        uint8_t *data0[AVRESAMPLE_MAX_CHANNELS] = { NULL };
 
         if (am->out_matrix_channels < am->out_channels ||
              am->in_matrix_channels <  am->in_channels) {