smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 19:56:31 +01:00
Code Issues Projects Releases Wiki Activity

Fix unset of LIBRARY_PATH environment variable

Browse source 
see also 82d491cb80
This commit is contained in:
Robin Gareus 2022-04-01 20:50:28 +02:00
parent 2942ecf27e
commit e15fb0dc38
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libs/pbd/system_exec.cc
View file

@ -596,19 +596,23 @@ extern char **environ;
void void
SystemExec::make_envp (bool supress_ld_env) SystemExec::make_envp (bool supress_ld_env)
{ {
int i = 0; int i = 0, j = 0;
envp = (char **) calloc(1, sizeof(char*)); envp = (char **) calloc (1, sizeof(char*));
/* copy current environment */ /* copy current environment */
for (i = 0; environ[i]; ++i) { for (i = 0; environ[i]; ++i) {
#ifndef __APPLE__ #ifdef __APPLE__
if (supress_ld_env && 0 == strncmp (environ[i], "LD_LIBRARY_PATH=", 17)) { if (supress_ld_env && 0 == strncmp (environ[i], "DYLD_FALLBACK_LIBRARY_PATH", 26)) {
continue;
}
#else
if (supress_ld_env && 0 == strncmp (environ[i], "LD_LIBRARY_PATH", 15)) {
continue; continue;
} }
#endif #endif
envp[i] = strdup(environ[i]); envp[j++] = strdup(environ[i]);
envp = (char **) realloc(envp, (i+2) * sizeof(char*)); envp = (char **) realloc(envp, (j + 1) * sizeof(char*));
} }
envp[i] = 0; envp[j] = 0;
} }
void void