From: Susant Sahani <ssahani@gmail.com>
Date: Mon, 2 Nov 2015 11:25:59 +0000 (+0530)
Subject: machine: fix extract_first_word
X-Git-Tag: v228~114^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1751%2Fhead;p=thirdparty%2Fsystemd.git

machine: fix extract_first_word
---

diff --git a/src/machine/machine.c b/src/machine/machine.c
index df8391c996c..ef5c8551b54 100644
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -323,11 +323,14 @@ int machine_load(Machine *m) {
                         int ifi;
 
                         r = extract_first_word(&p, &word, NULL, 0);
-                        if (r < 0)
-                                return log_error_errno(r, "Failed to parse NETIF: %s", netif);
-
                         if (r == 0)
                                 break;
+                        else if (r == -ENOMEM)
+                                return log_oom();
+                        else if (r < 0) {
+                                log_warning_errno(r, "Failed to parse NETIF: %s", netif);
+                                continue;
+                        }
 
                         if (safe_atoi(word, &ifi) < 0)
                                 continue;