Skip to content

W
wine-winehq
Commit f55ee1a2 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard
Browse files
Options

msi: Don't crash if no working directory is specified for custom action type 34.

parent da922769
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
dlls/msi/custom.c
View file @ f55ee1a2
...@@ -935,13 +935,15 @@ static UINT HANDLE_CustomType50(MSIPACKAGE *package, LPCWSTR source, ...@@ -935,13 +935,15 @@ static UINT HANDLE_CustomType50(MSIPACKAGE *package, LPCWSTR source,
static UINT HANDLE_CustomType34(MSIPACKAGE *package, LPCWSTR source, static UINT HANDLE_CustomType34(MSIPACKAGE *package, LPCWSTR source,
LPCWSTR target, const INT type, LPCWSTR action) LPCWSTR target, const INT type, LPCWSTR action)
{ {
const WCHAR *workingdir; const WCHAR *workingdir = NULL;
HANDLE handle; HANDLE handle;
WCHAR *cmd; WCHAR *cmd;
workingdir = msi_get_target_folder( package, source ); if (source)
if (!workingdir) return ERROR_FUNCTION_FAILED; {
workingdir = msi_get_target_folder( package, source );
if (!workingdir) return ERROR_FUNCTION_FAILED;
}
deformat_string( package, target, &cmd ); deformat_string( package, target, &cmd );
if (!cmd) return ERROR_FUNCTION_FAILED; if (!cmd) return ERROR_FUNCTION_FAILED;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment