From 35326597c2f5d1e42c56feaf7f8aedac9c9d14ff Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.ancell@canonical.com>
Date: Wed, 9 Feb 2022 10:25:54 +1300
Subject: Don't call setenv with a NULL value - the behaviour is undefined.

---
 src/process.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/process.c b/src/process.c
index d25c909b..aa614d36 100644
--- a/src/process.c
+++ b/src/process.c
@@ -248,7 +248,13 @@ process_start (Process *process, gboolean block)
             environ = NULL;
 #endif
         for (guint i = 0; i < env_length; i++)
-            setenv (env_keys[i], env_values[i], TRUE);
+        {
+            const gchar *value = env_values[i];
+            if (value != NULL)
+                setenv (env_keys[i], value, TRUE);
+            else
+                unsetenv (env_keys[i]);
+        }
 
         /* Reset SIGPIPE handler so the child has default behaviour (we disabled it at LightDM start) */
         signal (SIGPIPE, SIG_DFL);
-- 
cgit v1.2.1