2017-01-31 17:11:17 +00:00
|
|
|
From acfeb54e985d6f4d589c574ba5d467fbe4d556b7 Mon Sep 17 00:00:00 2001
|
2017-01-29 22:22:41 +00:00
|
|
|
From: Evgeny Vereshchagin <evvers@ya.ru>
|
|
|
|
|
Date: Mon, 9 Jan 2017 22:45:41 +0000
|
|
|
|
|
Subject: [PATCH] shared: check strdup != NULL
|
|
|
|
|
|
|
|
|
|
This is a follow-up for dc7dd61de610e9330
|
|
|
|
|
|
|
|
|
|
(cherry picked from commit d054eae6c954baa857170bb60072c8a2ecea0d6b)
|
|
|
|
|
---
|
|
|
|
|
src/shared/install.c | 6 +++++-
|
|
|
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/src/shared/install.c b/src/shared/install.c
|
|
|
|
|
index 64fe522ebb..0bb47ac527 100644
|
|
|
|
|
--- a/src/shared/install.c
|
|
|
|
|
+++ b/src/shared/install.c
|
|
|
|
|
@@ -1899,7 +1899,11 @@ int unit_file_unmask(
|
|
|
|
|
if (!GREEDY_REALLOC0(todo, n_allocated, n_todo + 2))
|
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
|
|
- todo[n_todo++] = strdup(*i);
|
|
|
|
|
+ todo[n_todo] = strdup(*i);
|
|
|
|
|
+ if (!todo[n_todo])
|
|
|
|
|
+ return -ENOMEM;
|
|
|
|
|
+
|
|
|
|
|
+ n_todo++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
strv_uniq(todo);
|
