From 8a7494dd089d6e6b80eaae11869d32125ff23503 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sun, 3 Apr 2016 20:48:51 +0000 Subject: [PATCH] [KERNEL32] - Correctly calculate the buffer size if the PATH variable is set but empty in BasepComputeProcessPath. Yes, this is a bug in Windows. CORE-11080 #resolve svn path=/trunk/; revision=71097 --- reactos/dll/win32/kernel32/client/path.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/reactos/dll/win32/kernel32/client/path.c b/reactos/dll/win32/kernel32/client/path.c index 21415a5e821..dc3b044f342 100644 --- a/reactos/dll/win32/kernel32/client/path.c +++ b/reactos/dll/win32/kernel32/client/path.c @@ -210,9 +210,13 @@ BasepComputeProcessPath(IN PBASE_SEARCH_PATH_TYPE PathOrder, } else { - /* Add the length of the PATH variable */ + /* Add the length of the PATH variable unless it's empty */ ASSERT(!(EnvPath.Length & 1)); - PathLengthInBytes += (EnvPath.Length + sizeof(L';')); + if (EnvPath.Length) + { + /* Reserve space for the variable and a semicolon */ + PathLengthInBytes += (EnvPath.Length + sizeof(L';')); + } } break; -- 2.17.1