From cf36b2aa9b83a1270eb59cad49341b64c32f3a9f Mon Sep 17 00:00:00 2001
From: "frkoenig@google.com"
 <frkoenig@google.com@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Wed, 24 Aug 2011 15:48:47 +0000
Subject: [PATCH] Match new[] / delete []

Quiet valgrind warnings by correctly matching
new[] with delete[].
Review URL: http://webrtc-codereview.appspot.com/126005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@437 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .../source/linux/audio_device_pulse_linux.cc  | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/modules/audio_device/main/source/linux/audio_device_pulse_linux.cc b/src/modules/audio_device/main/source/linux/audio_device_pulse_linux.cc
index bbb86ee5a..512121634 100644
--- a/src/modules/audio_device/main/source/linux/audio_device_pulse_linux.cc
+++ b/src/modules/audio_device/main/source/linux/audio_device_pulse_linux.cc
@@ -144,27 +144,23 @@ AudioDeviceLinuxPulse::~AudioDeviceLinuxPulse()
 
     if (_recBuffer)
     {
-        delete _recBuffer;
+        delete [] _recBuffer;
+        _recBuffer = NULL;
     }
     if (_playBuffer)
     {
-        delete _playBuffer;
+        delete [] _playBuffer;
+        _playBuffer = NULL;
     }
     if (_playDeviceName)
     {
-        delete _playDeviceName;
+        delete [] _playDeviceName;
+        _playDeviceName = NULL;
     }
     if (_recDeviceName)
     {
-        delete _recDeviceName;
-    }
-    if (_playDisplayDeviceName)
-    {
-        delete _playDisplayDeviceName;
-    }
-    if (_recDisplayDeviceName)
-    {
-        delete _recDisplayDeviceName;
+        delete [] _recDeviceName;
+        _recDeviceName = NULL;
     }
 
     delete &_recStartEvent;
@@ -1682,7 +1678,7 @@ WebRtc_Word32 AudioDeviceLinuxPulse::StopRecording()
 
     if (_recBuffer)
     {
-        delete _recBuffer;
+        delete [] _recBuffer;
         _recBuffer = NULL;
     }
 
@@ -1814,7 +1810,7 @@ WebRtc_Word32 AudioDeviceLinuxPulse::StopPlayout()
 
     if (_playBuffer)
     {
-        delete _playBuffer;
+        delete [] _playBuffer;
         _playBuffer = NULL;
     }
 
@@ -2961,7 +2957,7 @@ bool AudioDeviceLinuxPulse::PlayThreadProcess()
         // Clear device name
         if (_playDeviceName)
         {
-            delete[] _playDeviceName;
+            delete [] _playDeviceName;
             _playDeviceName = NULL;
         }
 
@@ -3172,7 +3168,7 @@ bool AudioDeviceLinuxPulse::RecThreadProcess()
         // Clear device name
         if (_recDeviceName)
         {
-            delete[] _recDeviceName;
+            delete [] _recDeviceName;
             _recDeviceName = NULL;
         }