Marcus Meissner : shlwapi: Handle NULL ptr return from allocation (Coverity ).
Alexandre Julliard
julliard at winehq.org
Mon Jun 7 10:02:29 CDT 2010
Module: wine
Branch: master
Commit: f01c43c47b9fe4bbc64874edb0af3bcd30c2b9a1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f01c43c47b9fe4bbc64874edb0af3bcd30c2b9a1
Author: Marcus Meissner <marcus at jet.franken.de>
Date: Thu Jun 3 13:10:17 2010 +0200
shlwapi: Handle NULL ptr return from allocation (Coverity).
---
dlls/shlwapi/ordinal.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index 18295e4..5f332f3 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/dlls/shlwapi/ordinal.c
@@ -4506,12 +4506,18 @@ INT WINAPIV ShellMessageBoxWrapW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText,
{
const WCHAR *ptr;
UINT len = LoadStringW(hInstance, LOWORD(lpText), (LPWSTR)&ptr, 0);
+
if (len)
{
szText = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR));
if (szText) LoadStringW(hInstance, LOWORD(lpText), szText, len + 1);
}
pszText = szText;
+ if (!pszText) {
+ WARN("Failed to load id %d\n", LOWORD(lpText));
+ __ms_va_end(args);
+ return 0;
+ }
}
else
pszText = lpText;
More information about the wine-cvs
mailing list