From: Magnus Hagander <magnus@hagander.net>
Date: Thu, 12 Feb 2009 12:53:34 +0000 (+0000)
Subject: Don't call SetEnvironmentVariable() when removing an environment variable,
X-Git-Tag: REL9_0_0~2420
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b31d0719fbd9362564d560f2ea776b50392e41d0;p=pg-rex%2Fsyncrep.git

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.
---

diff --git a/src/port/win32env.c b/src/port/win32env.c
index 7533549608..36888286b7 100644
--- a/src/port/win32env.c
+++ b/src/port/win32env.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/win32env.c,v 1.1 2009/01/21 10:30:02 mha Exp $
+ *	  $PostgreSQL: pgsql/src/port/win32env.c,v 1.2 2009/02/12 12:53:34 mha Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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);