Merge pull request #7061 from lkundrak/lr/serialized-environment

Environment serialization/deserialization inconsistently validates the variables
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2017-10-15 12:47:30 +02:00
committed by GitHub
2 changed files with 7 additions and 8 deletions
+1 -6
View File
@@ -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);
}