summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-14 05:23:31 +0000
committerdalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-14 05:23:31 +0000
commit41c10e04339aafdac4965299f3dc6e0cecbf6050 (patch)
tree74225e4205c0dbdd18a74523e9f8cd64a6b44d39
parent96dda5b4f00897d10f40f4e8f31f070eb94ab40c (diff)
downloadchromium_src-41c10e04339aafdac4965299f3dc6e0cecbf6050.zip
chromium_src-41c10e04339aafdac4965299f3dc6e0cecbf6050.tar.gz
chromium_src-41c10e04339aafdac4965299f3dc6e0cecbf6050.tar.bz2
Fix valgrind issues with AudioRendererMixerUnittest.
Fixes a memory leak and use of uninitialized data. BUG=none TEST=valgrind+media_unittests TBR=scherkus Review URL: https://chromiumcodereview.appspot.com/10780008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146722 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--media/base/audio_renderer_mixer_unittest.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/media/base/audio_renderer_mixer_unittest.cc b/media/base/audio_renderer_mixer_unittest.cc
index 9f46dc1..31b25ca 100644
--- a/media/base/audio_renderer_mixer_unittest.cc
+++ b/media/base/audio_renderer_mixer_unittest.cc
@@ -134,6 +134,10 @@ class AudioRendererMixerTest
for (size_t i = 0; i < fake_callbacks_.size(); ++i)
fake_callbacks_[i]->set_half_fill(true);
expected_callback_->set_half_fill(true);
+ for (size_t i = 0; i < expected_audio_data_.size(); ++i) {
+ memset(expected_audio_data_[i], 0,
+ sizeof(*expected_audio_data_[i]) * request_frames);
+ }
}
// Render actual audio data.
@@ -284,6 +288,8 @@ class AudioRendererMixerTest
virtual ~AudioRendererMixerTest() {
for (size_t i = 0; i < audio_data_.size(); ++i)
delete [] audio_data_[i];
+ for (size_t i = 0; i < expected_audio_data_.size(); ++i)
+ delete [] expected_audio_data_[i];
}
scoped_refptr<MockAudioRendererSink> sink_;