rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Magnus Hagander 2009-02-12 12:53:34 +00:00
parent 6d1e361852
commit b31d0719fb
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/port/win32env.c
View File

@ -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);