mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 07:07:04 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: tools: use my_unsetenv instead of unsetenv

Browse Source 
Let's use our own implementation of unsetenv() instead of the one, which is
provided in libc. Implementation from libc may vary in dependency of UNIX
distro. Implemenation from libc.so.1 ported on Illumos (see the link below) has
caused an eternal loop in the clean_env(), where we invoke unsetenv().

(https://github.com/illumos/illumos-gate/blob/master/usr/src/lib/libc/port/gen/getenv.c#L411C1-L456C1)

This is reported at GitHUB #3018 and the reporter has proposed the patch, which
we really appreciate! But looking at his fix and to the implementations of
unsetenv() in FreeBSD libc and in Linux glibc 2.31, it seems, that the algorithm
of clean_env() will perform better with our my_unsetenv() implementation.

This should be backported in versions 3.1 and 3.2.
This commit is contained in:
Valentine Krasnobaeva 2025-06-26 16:49:12 +02:00 committed by Willy Tarreau
parent 27baa3f9ff
commit a9afc10ae8
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/tools.c
View File

@ -7147,7 +7147,7 @@ int backup_env(void)
* doesn't contain "=" (the latter is mandatory format for strings kept in * doesn't contain "=" (the latter is mandatory format for strings kept in
* **environ). This allows to terminate the process at the startup stage, if it * **environ). This allows to terminate the process at the startup stage, if it
* was launched in zero-warning mode and there are some problems with * was launched in zero-warning mode and there are some problems with
* environment. * environment. It's not thread-safe as uses my_unsetenv, which is not thread-safe.
*/ */
int clean_env(void) int clean_env(void)
{ {
@ -7172,9 +7172,8 @@ int clean_env(void)
return -1; return -1;
} }
if (unsetenv(name) != 0) my_unsetenv(name);
ha_warning("unsetenv() fails for '%s': %s.\n",
name, strerror(errno));
free(name); free(name);
} }