Michael Stefaniuc : winealsa.drv: Remove redundant NULL checks before free (Smatch).

Alexandre Julliard julliard at winehq.org
Tue Oct 11 14:03:38 CDT 2011


Module: wine
Branch: master
Commit: d8ca6972339ad3f2e35276bff4aab2485a0cdce4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d8ca6972339ad3f2e35276bff4aab2485a0cdce4

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Tue Oct 11 00:03:50 2011 +0200

winealsa.drv: Remove redundant NULL checks before free (Smatch).

---

 dlls/winealsa.drv/mmdevdrv.c |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c
index 160371c..ea5da17 100644
--- a/dlls/winealsa.drv/mmdevdrv.c
+++ b/dlls/winealsa.drv/mmdevdrv.c
@@ -1043,18 +1043,12 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface,
 exit:
     HeapFree(GetProcessHeap(), 0, sw_params);
     if(FAILED(hr)){
-        if(This->local_buffer){
-            HeapFree(GetProcessHeap(), 0, This->local_buffer);
-            This->local_buffer = NULL;
-        }
-        if(This->fmt){
-            CoTaskMemFree(This->fmt);
-            This->fmt = NULL;
-        }
-        if(This->vols){
-            HeapFree(GetProcessHeap(), 0, This->vols);
-            This->vols = NULL;
-        }
+        HeapFree(GetProcessHeap(), 0, This->local_buffer);
+        This->local_buffer = NULL;
+        CoTaskMemFree(This->fmt);
+        This->fmt = NULL;
+        HeapFree(GetProcessHeap(), 0, This->vols);
+        This->vols = NULL;
     }
 
     LeaveCriticalSection(&This->lock);




More information about the wine-cvs mailing list