marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

oldstable
Michael Stefaniuc 2006-06-07 10:55:33 +02:00 committed by Alexandre Julliard
parent 4e66d4791c
commit 56026299d0
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/advpack/install.c
View File

@ -274,7 +274,7 @@ static HRESULT iterate_section_fields(HINF hinf, PCWSTR section, PCWSTR key,
hr = S_OK; hr = S_OK;
done: done:
if (buffer && buffer != static_buffer) HeapFree(GetProcessHeap(), 0, buffer); if (buffer != static_buffer) HeapFree(GetProcessHeap(), 0, buffer);
return hr; return hr;
} }

2
dlls/setupapi/install.c
View File

@ -787,7 +787,7 @@ static BOOL iterate_section_fields( HINF hinf, PCWSTR section, PCWSTR key,
} }
ret = TRUE; ret = TRUE;
done: done:
if (buffer && buffer != static_buffer) HeapFree( GetProcessHeap(), 0, buffer ); if (buffer != static_buffer) HeapFree( GetProcessHeap(), 0, buffer );
return ret; return ret;
} }

12
dlls/shlwapi/assoc.c
View File

@ -220,10 +220,10 @@ HRESULT WINAPI AssocQueryKeyA(ASSOCF cfFlags, ASSOCKEY assockey, LPCSTR pszAssoc
hRet = AssocQueryKeyW(cfFlags, assockey, lpszAssocW, lpszExtraW, phkeyOut); hRet = AssocQueryKeyW(cfFlags, assockey, lpszAssocW, lpszExtraW, phkeyOut);
} }
if (lpszAssocW && lpszAssocW != szAssocW) if (lpszAssocW != szAssocW)
HeapFree(GetProcessHeap(), 0, lpszAssocW); HeapFree(GetProcessHeap(), 0, lpszAssocW);
if (lpszExtraW && lpszExtraW != szExtraW) if (lpszExtraW != szExtraW)
HeapFree(GetProcessHeap(), 0, lpszExtraW); HeapFree(GetProcessHeap(), 0, lpszExtraW);
return hRet; 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); WideCharToMultiByte(CP_ACP,0,szReturnW,-1,pszOut,dwLenOut,0,0);
*pcchOut = dwLenOut; *pcchOut = dwLenOut;
if (lpszReturnW && lpszReturnW != szReturnW) if (lpszReturnW != szReturnW)
HeapFree(GetProcessHeap(), 0, lpszReturnW); HeapFree(GetProcessHeap(), 0, lpszReturnW);
} }
} }
if (lpszAssocW && lpszAssocW != szAssocW) if (lpszAssocW != szAssocW)
HeapFree(GetProcessHeap(), 0, lpszAssocW); HeapFree(GetProcessHeap(), 0, lpszAssocW);
if (lpszExtraW && lpszExtraW != szExtraW) if (lpszExtraW != szExtraW)
HeapFree(GetProcessHeap(), 0, lpszExtraW); HeapFree(GetProcessHeap(), 0, lpszExtraW);
return hRet; 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); HeapFree(GetProcessHeap(), 0, lpszExtraW);
return hRet; return hRet;
} }

2
dlls/x11drv/dib.c
View File

@ -4157,7 +4157,7 @@ INT X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan,
info->bmiHeader.biCompression = 0; info->bmiHeader.biCompression = 0;
} }
if(descr.colorMap && descr.colorMap != colorPtr) if(descr.colorMap != colorPtr)
HeapFree(GetProcessHeap(), 0, descr.colorMap); HeapFree(GetProcessHeap(), 0, descr.colorMap);
return lines; return lines;
} }

2
programs/regedit/listview.c
View File

@ -81,7 +81,7 @@ LPCTSTR GetValueName(HWND hwndLV)
{ {
INT item; INT item;
if (g_valueName && g_valueName != LPSTR_TEXTCALLBACK) if (g_valueName != LPSTR_TEXTCALLBACK)
HeapFree(GetProcessHeap(), 0, g_valueName); HeapFree(GetProcessHeap(), 0, g_valueName);
g_valueName = NULL; g_valueName = NULL;