ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32: Move a NULL pointer check before the place where we dereference the pointer.

This commit is contained in:
James Hawkins 2006-12-01 14:30:13 -08:00 committed by Alexandre Julliard
parent 58bb3571de
commit 44b0b462cb
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/shell32/shlexec.c
View File

@ -578,16 +578,19 @@ UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOperation,
TRACE("%s\n", (lpFile != NULL) ? debugstr_w(lpFile) : "-"); TRACE("%s\n", (lpFile != NULL) ? debugstr_w(lpFile) : "-");
if (!lpResult)
return ERROR_INVALID_PARAMETER;
xlpFile[0] = '\0'; xlpFile[0] = '\0';
lpResult[0] = '\0'; /* Start off with an empty return string */ lpResult[0] = '\0'; /* Start off with an empty return string */
if (key) *key = '\0'; if (key) *key = '\0';
/* trap NULL parameters on entry */ /* trap NULL parameters on entry */
if ((lpFile == NULL) || (lpResult == NULL)) if (!lpFile)
{ {
WARN("(lpFile=%s,lpResult=%s): NULL parameter\n", WARN("(lpFile=%s,lpResult=%s): NULL parameter\n",
debugstr_w(lpFile), debugstr_w(lpResult)); debugstr_w(lpFile), debugstr_w(lpResult));
return 2; /* File not found. Close enough, I guess. */ return ERROR_FILE_NOT_FOUND; /* File not found. Close enough, I guess. */
} }
if (SHELL_TryAppPathW( lpFile, lpResult, env )) if (SHELL_TryAppPathW( lpFile, lpResult, env ))