From 7ac9f73c7ddfecd6f81fb907c4e61ed2339c95d8 Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Fri, 9 Aug 2013 11:30:38 +0100 Subject: [PATCH] weston-launch: Only pass non-NULL value into setenv() getenv() can return NULL is the key is not set, passing NULL into setenv() is an error --- src/weston-launch.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/weston-launch.c b/src/weston-launch.c index 5b030945..7264f7e2 100644 --- a/src/weston-launch.c +++ b/src/weston-launch.c @@ -515,7 +515,8 @@ setup_session(struct weston_launch *wl) term = getenv("TERM"); clearenv(); - setenv("TERM", term, 1); + if (term) + setenv("TERM", term, 1); setenv("USER", wl->pw->pw_name, 1); setenv("LOGNAME", wl->pw->pw_name, 1); setenv("HOME", wl->pw->pw_dir, 1);