From 56026299d0ce1bbc3b389cddcda08a1b9d9704c0 Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Wed, 7 Jun 2006 10:55:33 +0200
Subject: [PATCH] Remove more redundant NULL checks before HeapFree (found by
 Smatch).

---
 dlls/advpack/install.c      |  2 +-
 dlls/setupapi/install.c     |  2 +-
 dlls/shlwapi/assoc.c        | 12 ++++++------
 dlls/x11drv/dib.c           |  2 +-
 programs/regedit/listview.c |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c
index 093f0e5d04e..20441cfe2e3 100644
--- a/dlls/advpack/install.c
+++ b/dlls/advpack/install.c
@@ -274,7 +274,7 @@ static HRESULT iterate_section_fields(HINF hinf, PCWSTR section, PCWSTR key,
     hr = S_OK;
 
  done:
-    if (buffer && buffer != static_buffer) HeapFree(GetProcessHeap(), 0, buffer);
+    if (buffer != static_buffer) HeapFree(GetProcessHeap(), 0, buffer);
     return hr;
 }
 
diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c
index 78c472e9e5c..591e9e6d214 100644
--- a/dlls/setupapi/install.c
+++ b/dlls/setupapi/install.c
@@ -787,7 +787,7 @@ static BOOL iterate_section_fields( HINF hinf, PCWSTR section, PCWSTR key,
     }
     ret = TRUE;
  done:
-    if (buffer && buffer != static_buffer) HeapFree( GetProcessHeap(), 0, buffer );
+    if (buffer != static_buffer) HeapFree( GetProcessHeap(), 0, buffer );
     return ret;
 }
 
diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c
index 741d99de3e3..8f3827f1871 100644
--- a/dlls/shlwapi/assoc.c
+++ b/dlls/shlwapi/assoc.c
@@ -220,10 +220,10 @@ HRESULT WINAPI AssocQueryKeyA(ASSOCF cfFlags, ASSOCKEY assockey, LPCSTR pszAssoc
     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 @@ HRESULT WINAPI AssocQueryStringA(ASSOCF cfFlags, ASSOCSTR str, LPCSTR pszAssoc,
         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 @@ HRESULT WINAPI AssocQueryStringByKeyA(ASSOCF cfFlags, ASSOCSTR str, HKEY hkAssoc
     }
   }
 
-  if (lpszExtraW && lpszExtraW != szExtraW)
+  if (lpszExtraW != szExtraW)
     HeapFree(GetProcessHeap(), 0, lpszExtraW);
   return hRet;
 }
diff --git a/dlls/x11drv/dib.c b/dlls/x11drv/dib.c
index 0d53c1df588..51f57c8139a 100644
--- a/dlls/x11drv/dib.c
+++ b/dlls/x11drv/dib.c
@@ -4157,7 +4157,7 @@ INT X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan,
     info->bmiHeader.biCompression = 0;
   }
 
-  if(descr.colorMap && descr.colorMap != colorPtr)
+  if(descr.colorMap != colorPtr)
       HeapFree(GetProcessHeap(), 0, descr.colorMap);
   return lines;
 }
diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c
index cddeea0bb6d..8b96068a822 100644
--- a/programs/regedit/listview.c
+++ b/programs/regedit/listview.c
@@ -81,7 +81,7 @@ LPCTSTR GetValueName(HWND hwndLV)
 {
     INT item;
 
-    if (g_valueName && g_valueName != LPSTR_TEXTCALLBACK)
+    if (g_valueName != LPSTR_TEXTCALLBACK)
         HeapFree(GetProcessHeap(), 0,  g_valueName);
     g_valueName = NULL;