Henri Verbeet : ntdll: Clear ret->Buffer on failure in get_env_var() (Valgrind).

Alexandre Julliard julliard at winehq.org
Mon Apr 26 15:51:32 CDT 2021


Module: wine
Branch: master
Commit: b9070e115369118a8655f6e6c306ff51af31a242
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=b9070e115369118a8655f6e6c306ff51af31a242

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Mon Apr 26 13:41:35 2021 +0200

ntdll: Clear ret->Buffer on failure in get_env_var() (Valgrind).

Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ntdll/loader.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index b76a8137a1b..ee453700e51 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -2616,7 +2616,11 @@ static NTSTATUS get_env_var( const WCHAR *name, SIZE_T extra, UNICODE_STRING *re
             return status;
         }
         RtlFreeHeap( GetProcessHeap(), 0, ret->Buffer );
-        if (status != STATUS_BUFFER_TOO_SMALL) return status;
+        if (status != STATUS_BUFFER_TOO_SMALL)
+        {
+            ret->Buffer = NULL;
+            return status;
+        }
         size = len + 1 + extra;
     }
 }




More information about the wine-cvs mailing list