Blame 0068-nspawn-log-out-of-memory-errors.patch
|
 |
a52f674 |
From 4f54a2da178f683d7c7b86df6aa3b873802dcea0 Mon Sep 17 00:00:00 2001
|
|
|
930e1b8 |
From: Djalal Harouni <tixxdz@opendz.org>
|
|
|
930e1b8 |
Date: Tue, 5 Nov 2013 15:26:37 +0100
|
|
|
930e1b8 |
Subject: [PATCH] nspawn: log out of memory errors
|
|
|
930e1b8 |
|
|
|
930e1b8 |
---
|
|
|
930e1b8 |
src/nspawn/nspawn.c | 7 +++++--
|
|
|
930e1b8 |
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
930e1b8 |
|
|
|
930e1b8 |
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
|
|
|
930e1b8 |
index 9616dbf..db47fbd 100644
|
|
|
930e1b8 |
--- a/src/nspawn/nspawn.c
|
|
|
930e1b8 |
+++ b/src/nspawn/nspawn.c
|
|
|
930e1b8 |
@@ -224,6 +224,9 @@ static int parse_argv(int argc, char *argv[]) {
|
|
|
930e1b8 |
|
|
|
930e1b8 |
case 'S':
|
|
|
930e1b8 |
arg_slice = strdup(optarg);
|
|
|
930e1b8 |
+ if (!arg_slice)
|
|
|
930e1b8 |
+ return log_oom();
|
|
|
930e1b8 |
+
|
|
|
930e1b8 |
break;
|
|
|
930e1b8 |
|
|
|
930e1b8 |
case 'M':
|
|
|
930e1b8 |
@@ -315,11 +318,11 @@ static int parse_argv(int argc, char *argv[]) {
|
|
|
930e1b8 |
|
|
|
930e1b8 |
r = strv_extend(x, a);
|
|
|
930e1b8 |
if (r < 0)
|
|
|
930e1b8 |
- return r;
|
|
|
930e1b8 |
+ return log_oom();
|
|
|
930e1b8 |
|
|
|
930e1b8 |
r = strv_extend(x, b);
|
|
|
930e1b8 |
if (r < 0)
|
|
|
930e1b8 |
- return r;
|
|
|
930e1b8 |
+ return log_oom();
|
|
|
930e1b8 |
|
|
|
930e1b8 |
break;
|
|
|
930e1b8 |
}
|