25 lines
672 B
Diff
25 lines
672 B
Diff
|
From b430e6ff0580b962c0b36dd5817dac681c159a58 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lennart Poettering <lennart@poettering.net>
|
||
|
|
Date: Wed, 2 Oct 2013 19:38:28 +0200
|
||
|
|
Subject: [PATCH] strv: don't access potentially NULL string arrays
|
||
|
|
|
||
|
|
---
|
||
|
|
src/shared/env-util.c | 4 +++-
|
||
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/shared/env-util.c b/src/shared/env-util.c
|
||
|
|
index 5e29629..7976881 100644
|
||
|
|
--- a/src/shared/env-util.c
|
||
|
|
+++ b/src/shared/env-util.c
|
||
|
|
@@ -405,7 +405,9 @@ char **strv_env_clean_log(char **e, const char *message) {
|
||
|
|
e[k++] = *p;
|
||
|
|
}
|
||
|
|
|
||
|
|
- e[k] = NULL;
|
||
|
|
+ if (e)
|
||
|
|
+ e[k] = NULL;
|
||
|
|
+
|
||
|
|
return e;
|
||
|
|
}
|
||
|
|
|