[PATCH 0/1] MR6465: msiexec: Avoid crash if PackageName is NULL.

[Dmitry Timoshkov (＠dmitry)]

This happens for 'msiexec /p'.

Fixes regression caused by 14b718b69bb8d62c3ae84c52d4210e81c1d21208.

[PATCH 1/1] msiexec: Avoid crash if PackageName is NULL.

[Dmitry Timoshkov]

From: Dmitry Timoshkov

This happens for 'msiexec /p'.

Fixes regression caused by 14b718b69bb8d62c3ae84c52d4210e81c1d21208.

Signed-off-by: Dmitry Timoshkov 
---
 programs/msiexec/msiexec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c
index e83f4b5f33e..9e751d58955 100644
--- a/programs/msiexec/msiexec.c
+++ b/programs/msiexec/msiexec.c
@@ -686,7 +686,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
    DWORD ReturnCode;
    int argc;
    LPWSTR *argvW = NULL;
-	WCHAR *path, *package_unquoted;
+	WCHAR *path, *package_unquoted = NULL;

InitCommonControls();

@@ -1095,7 +1095,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
    if(FunctionInstallAdmin && FunctionPatch)
    	FunctionInstall = FALSE;

-    if (!(package_unquoted = remove_quotes( PackageName))) return ERROR_OUTOFMEMORY;
+    if (PackageName && !(package_unquoted = remove_quotes(PackageName))) return ERROR_OUTOFMEMORY;

ReturnCode = 1;
    if(FunctionInstall)

[PATCH 0/1] MR6465: msiexec: Avoid crash if PackageName is NULL. - approved

[Hans Leidekker (＠hans)]

This merge request was approved by Hans Leidekker.