From: Djalal Harouni <tixxdz@opendz.org>
Date: Tue, 5 Nov 2013 14:26:37 +0000 (+0100)
Subject: nspawn: log out of memory errors
X-Git-Tag: v209~1647
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=b3451bed41453304735b68726571d49fb676d466;ds=sidebyside

nspawn: log out of memory errors
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 14774566a..80903a7ae 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -224,6 +224,9 @@ static int parse_argv(int argc, char *argv[]) {
 
                 case 'S':
                         arg_slice = strdup(optarg);
+                        if (!arg_slice)
+                                return log_oom();
+
                         break;
 
                 case 'M':
@@ -315,11 +318,11 @@ static int parse_argv(int argc, char *argv[]) {
 
                         r = strv_extend(x, a);
                         if (r < 0)
-                                return r;
+                                return log_oom();
 
                         r = strv_extend(x, b);
                         if (r < 0)
-                                return r;
+                                return log_oom();
 
                         break;
                 }