Correct return value in a couple of error cases.

6d169747 · Juan Lang · Alexandre Julliard · 347081d5 · 6d169747
Commit 6d169747 authored Apr 15, 2004 by Juan Lang Committed by Alexandre Julliard Apr 15, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

pidl.c dlls/shell32/pidl.c +4 -1

No files found.
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -1621,6 +1621,9 @@ HRESULT _ILCreateFromPathA(LPCSTR szPath, LPITEMIDLIST* ppidl)
 	HANDLE hFile;
 	WIN32_FIND_DATAA stffile;

+    if (!ppidl)
+        return E_INVALIDARG;
+
 	hFile = FindFirstFileA(szPath, &stffile);

 	if (hFile == INVALID_HANDLE_VALUE)
@@ -1630,7 +1633,7 @@ HRESULT _ILCreateFromPathA(LPCSTR szPath, LPITEMIDLIST* ppidl)

 	*ppidl = _ILCreateFromFindDataA(&stffile);

-	return S_OK;
+	return *ppidl ? S_OK : E_OUTOFMEMORY;
 }

 LPITEMIDLIST _ILCreateDrive(LPCWSTR lpszNew)