From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Tue, 3 Nov 2015 21:32:34 +0000 (+0300)
Subject: core: small fixes to parse_namespace
X-Git-Tag: v228~97^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1773%2Fhead;p=thirdparty%2Fsystemd.git

core: small fixes to parse_namespace

* don't hide ENOMEM
* log r instead of 0
---

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index a30cd0967d5..59497493748 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -3232,12 +3232,14 @@ int config_parse_namespace_path_strv(
                 int offset;
 
                 r = extract_first_word(&cur, &word, NULL, EXTRACT_QUOTES);
+                if (r == 0)
+                        break;
+                if (r == -ENOMEM)
+                        return log_oom();
                 if (r < 0) {
-                        log_syntax(unit, LOG_ERR, filename, line, 0, "Trailing garbage, ignoring: %s", prev);
+                        log_syntax(unit, LOG_ERR, filename, line, r, "Trailing garbage, ignoring: %s", prev);
                         return 0;
                 }
-                if (r == 0)
-                        break;
 
                 if (!utf8_is_valid(word)) {
                         log_syntax_invalid_utf8(unit, LOG_ERR, filename, line, word);