From: Hans Leidekker <hans@codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=60221 --- dlls/msi/custom.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 64e434ddcaa..6ea99ef28e5 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -996,18 +996,23 @@ static UINT HANDLE_CustomType19( MSIPACKAGE *package, const WCHAR *source, const static WCHAR *build_msiexec_args( const WCHAR *filename, const WCHAR *params ) { - UINT len_filename = lstrlenW( filename ), len_params = lstrlenW( params ); + UINT len_filename = wcslen( filename ), len_params = 0; UINT len = ARRAY_SIZE(L"/qb /i ") - 1; WCHAR *ret; + if (params) len_params = wcslen( params ); if (!(ret = malloc( (len + len_filename + len_params + 4) * sizeof(WCHAR) ))) return NULL; + memcpy( ret, L"/qb /i ", sizeof(L"/qb /i ") ); ret[len++] = '"'; memcpy( ret + len, filename, len_filename * sizeof(WCHAR) ); len += len_filename; ret[len++] = '"'; - ret[len++] = ' '; - lstrcpyW( ret + len, params ); + if (params) + { + ret[len++] = ' '; + wcscpy( ret + len, params ); + } return ret; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11751