summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarald Hoyer <harald@redhat.com>2013-04-18 07:15:03 +0200
committerHarald Hoyer <harald@redhat.com>2013-04-18 07:16:01 +0200
commit5521d6985648669a65d0529bb01c7a32edc99294 (patch)
treee23bdea140cb8f2244bc1bc2a2a39ffc64877dbb
parent14787e64997c8915eb8756076b6f7de8c38e3eeb (diff)
core/execute: only clean the environment, if we have one
-rw-r--r--src/core/execute.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/execute.c b/src/core/execute.c
index aad11c94aa..26cde24f15 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;