chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
dd9f052
)
nspawn: log out of memory errors
author
Djalal Harouni
<tixxdz@opendz.org>
Tue, 5 Nov 2013 14:26:37 +0000
(15:26 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 5 Nov 2013 17:06:44 +0000
(18:06 +0100)
src/nspawn/nspawn.c
patch
|
blob
|
history
diff --git
a/src/nspawn/nspawn.c
b/src/nspawn/nspawn.c
index 14774566a64dfe2c5f71946f88855a5c136003ad..80903a7aef0069b8a2b810edaa2133fcb0b685c0 100644
(file)
--- 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;
}