commit 56026299d0ce1bbc3b389cddcda08a1b9d9704c0
author Michael Stefaniuc <mstefani@redhat.de> Wed Jun 07 10:55:33 2006 +0200
committer Alexandre Julliard <julliard@winehq.org> Wed Jun 07 14:20:09 2006 +0200
tree c021bc8542bee9379d8f7ff403f443f3437af94b
parent 4e66d4791cc889230a700cfdd54318939536f485

Remove more redundant NULL checks before HeapFree (found by Smatch).

dlls/advpack/install.c

diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c
index 093f0e5..20441cf 100644
--- a/dlls/advpack/install.c
+++ b/dlls/advpack/install.c
@@ -274,7 +274,7 @@
     hr = S_OK;
 
  done:
-    if (buffer && buffer != static_buffer) HeapFree(GetProcessHeap(), 0, buffer);
+    if (buffer != static_buffer) HeapFree(GetProcessHeap(), 0, buffer);
     return hr;
 }
 

dlls/setupapi/install.c

diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c
index 78c472e..591e9e6 100644
--- a/dlls/setupapi/install.c
+++ b/dlls/setupapi/install.c
@@ -787,7 +787,7 @@
     }
     ret = TRUE;
  done:
-    if (buffer && buffer != static_buffer) HeapFree( GetProcessHeap(), 0, buffer );
+    if (buffer != static_buffer) HeapFree( GetProcessHeap(), 0, buffer );
     return ret;
 }
 

dlls/shlwapi/assoc.c

diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c
index 741d99d..8f3827f 100644
--- a/dlls/shlwapi/assoc.c
+++ b/dlls/shlwapi/assoc.c
@@ -220,10 +220,10 @@
     hRet = AssocQueryKeyW(cfFlags, assockey, lpszAssocW, lpszExtraW, phkeyOut);
   }
 
-  if (lpszAssocW && lpszAssocW != szAssocW)
+  if (lpszAssocW != szAssocW)
     HeapFree(GetProcessHeap(), 0, lpszAssocW);
 
-  if (lpszExtraW && lpszExtraW != szExtraW)
+  if (lpszExtraW != szExtraW)
     HeapFree(GetProcessHeap(), 0, lpszExtraW);
 
   return hRet;
@@ -312,14 +312,14 @@
         WideCharToMultiByte(CP_ACP,0,szReturnW,-1,pszOut,dwLenOut,0,0);
       *pcchOut = dwLenOut;
 
-      if (lpszReturnW && lpszReturnW != szReturnW)
+      if (lpszReturnW != szReturnW)
         HeapFree(GetProcessHeap(), 0, lpszReturnW);
     }
   }
 
-  if (lpszAssocW && lpszAssocW != szAssocW)
+  if (lpszAssocW != szAssocW)
     HeapFree(GetProcessHeap(), 0, lpszAssocW);
-  if (lpszExtraW && lpszExtraW != szExtraW)
+  if (lpszExtraW != szExtraW)
     HeapFree(GetProcessHeap(), 0, lpszExtraW);
   return hRet;
 }
@@ -406,7 +406,7 @@
     }
   }
 
-  if (lpszExtraW && lpszExtraW != szExtraW)
+  if (lpszExtraW != szExtraW)
     HeapFree(GetProcessHeap(), 0, lpszExtraW);
   return hRet;
 }

dlls/x11drv/dib.c

diff --git a/dlls/x11drv/dib.c b/dlls/x11drv/dib.c
index 0d53c1d..51f57c8 100644
--- a/dlls/x11drv/dib.c
+++ b/dlls/x11drv/dib.c
@@ -4157,7 +4157,7 @@
     info->bmiHeader.biCompression = 0;
   }
 
-  if(descr.colorMap && descr.colorMap != colorPtr)
+  if(descr.colorMap != colorPtr)
       HeapFree(GetProcessHeap(), 0, descr.colorMap);
   return lines;
 }

programs/regedit/listview.c

diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c
index cddeea0..8b96068 100644
--- a/programs/regedit/listview.c
+++ b/programs/regedit/listview.c
@@ -81,7 +81,7 @@
 {
     INT item;
 
-    if (g_valueName && g_valueName != LPSTR_TEXTCALLBACK)
+    if (g_valueName != LPSTR_TEXTCALLBACK)
         HeapFree(GetProcessHeap(), 0,  g_valueName);
     g_valueName = NULL;