summaryrefslogtreecommitdiff
path: root/src/basic
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-10-15 12:47:30 +0200
committerGitHub <noreply@github.com>2017-10-15 12:47:30 +0200
commit0051ca1f63e6d9c481e3b5f989e72ff538b17daa (patch)
tree9adcd29d2491fc1eb6806c1a0e2c53c80006839d /src/basic
parent92f34a9c4774b7bf2d9359821167716ce1974509 (diff)
parentc7d797bbdfaccd950988698823e17103f418a3c5 (diff)
downloadsystemd-0051ca1f63e6d9c481e3b5f989e72ff538b17daa.tar.gz
Merge pull request #7061 from lkundrak/lr/serialized-environment
Environment serialization/deserialization inconsistently validates the variables
Diffstat (limited to 'src/basic')
-rw-r--r--src/basic/env-util.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/basic/env-util.c b/src/basic/env-util.c
index fa42edfa96..0da10de0c8 100644
--- a/src/basic/env-util.c
+++ b/src/basic/env-util.c
@@ -805,14 +805,9 @@ int deserialize_environment(char ***environment, const char *line) {
assert(environment);
assert(startswith(line, "env="));
- r = cunescape(line + 4, UNESCAPE_RELAX, &uce);
+ r = cunescape(line + 4, 0, &uce);
if (r < 0)
return r;
- if (!env_assignment_is_valid(uce)) {
- free(uce);
- return -EINVAL;
- }
-
return strv_env_replace(environment, uce);
}