From 10ce74def79e33bdddbab4ca8d30e85f632bc1fd Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Thu, 12 Feb 2009 12:53:34 +0000 Subject: [PATCH] Don't call SetEnvironmentVariable() when removing an environment variable, as this seems to crash on at least some versions of MingW. Our current usage of this function does not require it, so it should be ok to ignore. --- src/port/win32env.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/port/win32env.c b/src/port/win32env.c index 9e8565aa70..26ddf3bfed 100644 --- a/src/port/win32env.c +++ b/src/port/win32env.c @@ -64,12 +64,18 @@ pgwin32_putenv(const char *envval) return -1; *cp = '\0'; cp++; - if (strlen(cp) == 0) - cp = NULL; - if (!SetEnvironmentVariable(envcpy, cp)) + if (strlen(cp)) { - free(envcpy); - return -1; + /* + * Only call SetEnvironmentVariable() when we are adding a variable, + * not when removing it. Calling it on both crashes on at least certain + * versions of MingW. + */ + if (!SetEnvironmentVariable(envcpy, cp)) + { + free(envcpy); + return -1; + } } free(envcpy); -- 2.39.5