Skip to content

Commit

Permalink
Several memory leaks in unit test: SpeechRecognitionAudioSinkTest.
Browse files Browse the repository at this point in the history
Due to uninitialized memory.
This CL is fixing the issue.

BUG=408940, 422164, 422472
TEST=Memory bot for content_unittests

Review URL: https://codereview.chromium.org/645363005

Cr-Commit-Position: refs/heads/master@{#299277}
  • Loading branch information
kristijanburnik authored and Commit bot committed Oct 13, 2014
1 parent 8b04ce8 commit 0aef155
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 55 deletions.
10 changes: 6 additions & 4 deletions content/renderer/media/speech_recognition_audio_sink_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ class FakeSpeechRecognizer {
media::AudioInputBuffer* buffer =
static_cast<media::AudioInputBuffer*>(shared_memory_->memory());
audio_track_bus_ = media::AudioBus::WrapMemory(sink_params, buffer->audio);
audio_track_bus_->Zero();

// Reference to the counter used to synchronize.
buffer_index_ = &(buffer->params.size);
Expand Down Expand Up @@ -221,7 +222,7 @@ class SpeechRecognitionAudioSinkTest : public testing::Test {
output_sample_rate,
kOutputBitsPerSample,
output_frames_per_buffer);
source_data_.reset(new int16[input_frames_per_buffer * kInputChannels]);
source_data_.reset(new int16[input_frames_per_buffer * kInputChannels]{});

// Prepare the track and audio source.
blink::WebMediaStreamTrack blink_track;
Expand Down Expand Up @@ -318,9 +319,10 @@ class SpeechRecognitionAudioSinkTest : public testing::Test {
const int output_sample_rate,
const int output_frames_per_buffer,
const uint32 consumptions) {
const uint32 kBuffersPerNotification =
Initialize(input_sample_rate, input_frames_per_buffer,
output_sample_rate, output_frames_per_buffer);
const uint32 kBuffersPerNotification = Initialize(input_sample_rate,
input_frames_per_buffer,
output_sample_rate,
output_frames_per_buffer);
AssertConsumedBuffers(0U);

for (uint32 i = 1U; i <= consumptions; ++i) {
Expand Down
34 changes: 0 additions & 34 deletions tools/valgrind/drmemory/suppressions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -667,37 +667,3 @@ blink_web.dll!blink::FrameView::removeFromAXObjectCache
blink_web.dll!blink::FrameView::prepareForDetach
blink_web.dll!blink::LocalFrame::setView
blink_web.dll!blink::FrameTree::~FrameTree

UNINITIALIZED READ
name=http://crbug.com/422472 (a)
shared_memory_support.dll!media::FromInterleavedInternal<>
shared_memory_support.dll!media::AudioBus::FromInterleavedPartial
shared_memory_support.dll!media::AudioBus::FromInterleaved
content.dll!content::SpeechRecognitionAudioSink::OnData
content.dll!content::MediaStreamAudioSinkOwner::OnData
content.dll!content::WebRtcLocalAudioTrack::Capture
*!content::SpeechRecognitionAudioSinkTest_RecognizerNotifiedOnSocket_Test::TestBody
*!testing::internal::HandleExceptionsInMethodIfSupported<>

UNINITIALIZED READ
name=http://crbug.com/422472 (b)
shared_memory_support.dll!media::FromInterleavedInternal<>
...
*!content::SpeechRecognitionAudioSinkTest::CaptureAudio
*!content::SpeechRecognitionAudioSinkTest_OnReadyStateChangedOccured_Test::TestBody

UNINITIALIZED READ
name=http://crbug.com/422472 (c)
shared_memory_support.dll!media::FromInterleavedInternal<>
...
*!content::SpeechRecognitionAudioSinkTest::CaptureAudio
*!content::SpeechRecognitionAudioSinkTest_SyncSocketFailsSendingData_Test::TestBody

UNINITIALIZED READ
name=http://crbug.com/422472 (d)
content.dll!content::`anonymous namespace'::MaxAmplitude
content.dll!content::MediaStreamAudioLevelCalculator::Calculate
content.dll!content::WebRtcLocalAudioTrack::Capture
...
*!content::SpeechRecognitionAudioSinkTest_*_Test::TestBody

17 changes: 0 additions & 17 deletions tools/valgrind/memcheck/suppressions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3469,23 +3469,6 @@
fun:_ZN5blink13InlineFlowBox5paintERNS_9PaintInfoERKNS_11LayoutPointENS_10LayoutUnitES6_
fun:_ZN5blink13RootInlineBox5paintERNS_9PaintInfoERKNS_11LayoutPointENS_10LayoutUnitES6_
}
{
bug_422472a
Memcheck:Uninitialized
fun:_ZN5mediaL23FromInterleavedInternalIssLs0EEEvPKviiPNS_8AudioBusEff
...
fun:_ZN7content30SpeechRecognitionAudioSinkTest12CaptureAudioEj
fun:_ZN7content30SpeechRecognitionAudioSinkTest35AssertConsumptionForAudioParametersEiiiij
fun:_ZN7content62SpeechRecognitionAudioSinkTest_RecognizerNotifiedOnSocket_Test8TestBodyEv
}
{
bug_422472b
Memcheck:Uninitialized
...
fun:_ZN7content31MediaStreamAudioLevelCalculator9CalculateEPKsii
...
fun:_ZN7content62SpeechRecognitionAudioSinkTest_RecognizerNotifiedOnSocket_Test8TestBodyEv
}
{
bug_422485
Memcheck:Overlap
Expand Down

0 comments on commit 0aef155

Please sign in to comment.