Filter cmd-line env vars.

1 files changed, 17 insertions, 2 deletions

diff --git a/src/app.c b/src/app.c
index ec4fb18..e3c6505 100644
--- a/src/app.c
+++ b/src/app.c
@@ -2109,6 +2109,9 @@ execute_cmdline_lwp (App *app, char **argv, gboolean attach_dbg, GError **error)
 	}
 	if (found) {
 	    /* override with the user's cmdline var */
+	    if (strcmp (env[n], "LD_PRELOAD") == 0)
+		have_preload = TRUE;
+
 	    continue;
 	}
 
@@ -2130,8 +2133,20 @@ execute_cmdline_lwp (App *app, char **argv, gboolean attach_dbg, GError **error)
 	envp[i++] = g_strconcat ("LD_PRELOAD=", lib, NULL);
     if (! have_socket)
 	envp[i++] = g_strconcat ("LWP_PATH=unix:", path, NULL);
-    while (n_client_env--)
-	envp[i++] = g_strdup (*argv++);
+    while (n_client_env--) {
+	char *equals = strchr (*argv, '=');
+	g_assert (equals != NULL);
+	*equals = '\0';
+	if (strcmp (*argv, "LD_PRELOAD") == 0) {
+	    envp[i++] = g_strdup_printf ("LD_PRELOAD=%s:%s", lib, equals+1);
+	} else if (strcmp (*argv, "LWP_PATH") == 0) {
+	    /* ignore */
+	} else {
+	    *equals = '=';
+	    envp[i++] = g_strdup (*argv);
+	}
+	argv++;
+    }
     envp[i] = NULL;
     g_strfreev (env);