[systemd-commits] src/core

[Harald Hoyer]

 src/core/execute.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 5521d6985648669a65d0529bb01c7a32edc99294
Author: Harald Hoyer <harald at redhat.com>
Date:   Thu Apr 18 07:15:03 2013 +0200

    core/execute: only clean the environment, if we have one

diff --git a/src/core/execute.c b/src/core/execute.c
index aad11c9..26cde24 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -1772,7 +1772,8 @@ int exec_context_load_environment(const ExecContext *c, char ***l) {
                                 return k;
                          }
                         /* Log invalid environment variables with filename */
-                        p = strv_env_clean_log(p, pglob.gl_pathv[n]);
+			if (p)
+	                        p = strv_env_clean_log(p, pglob.gl_pathv[n]);
 
                         if (r == NULL)
                                 r = p;