ntdll: Avoid leaking the previous environment in RtlSetCurrentEnvironment().

Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll: Avoid leaking the previous environment in RtlSetCurrentEnvironment().
e012bd58 · Zebediah Figura · Alexandre Julliard · d98b87a3 · e012bd58
Commit e012bd58 authored May 06, 2020 by Zebediah Figura Committed by Alexandre Julliard May 07, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

env.c dlls/ntdll/env.c +8 -1

No files found.
--- a/dlls/ntdll/env.c
+++ b/dlls/ntdll/env.c
@@ -996,14 +996,21 @@ NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR env,
 */
 void WINAPI RtlSetCurrentEnvironment(PWSTR new_env, PWSTR* old_env)
 {
+    WCHAR *prev;
+
    TRACE("(%p %p)\n", new_env, old_env);

    RtlAcquirePebLock();

-    if (old_env) *old_env = NtCurrentTeb()->Peb->ProcessParameters->Environment;
+    prev = NtCurrentTeb()->Peb->ProcessParameters->Environment;
    NtCurrentTeb()->Peb->ProcessParameters->Environment = new_env;

    RtlReleasePebLock();
+
+    if (old_env)
+        *old_env = prev;
+    else
+        RtlDestroyEnvironment( prev );
 }