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

This commit is contained in:
Hans Leidekker 2012-07-09 11:08:06 +02:00 committed by Alexandre Julliard
parent da922769c5
commit f55ee1a212

View file

@ -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;