From 5828d7c136cf4c22e1f999929f9e97c91c555123 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sat, 27 Feb 2021 17:42:26 +0100 Subject: [PATCH] ntdll: Adjust environment size for dynamic strings. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50732 Signed-off-by: Alexandre Julliard --- dlls/ntdll/unix/env.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index f5979a980ea..845abd69a79 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1591,7 +1591,6 @@ void init_startup_info(void) params->AllocationSize = size; params->Size = size; params->Flags = PROCESS_PARAMS_FLAG_NORMALIZED; - params->EnvironmentSize = env_size; params->DebugFlags = info->debug_flags; params->ConsoleHandle = wine_server_ptr_handle( info->console ); params->ConsoleFlags = info->console_flags; @@ -1637,7 +1636,8 @@ void init_startup_info(void) dst += copy_environment( dst, src ); memcpy( dst, dyn_env, dyn_size ); dst += dyn_size / sizeof(WCHAR); - *dst = 0; + *dst++ = 0; + params->EnvironmentSize = (dst - params->Environment) * sizeof(WCHAR); free( dyn_env ); free( info ); NtCurrentTeb()->Peb->ProcessParameters = params;