Blame SOURCES/0034-core-fix-return-value-on-OOM.patch
|
 |
803fb7 |
From 8cbaef2f9e08dc14e827445de76072e31aa6cce7 Mon Sep 17 00:00:00 2001
|
|
|
803fb7 |
From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
|
|
|
803fb7 |
Date: Sat, 28 Feb 2015 23:39:55 +0100
|
|
|
803fb7 |
Subject: [PATCH] core: fix return value on OOM
|
|
|
803fb7 |
|
|
|
803fb7 |
(cherry picked from commit c43b2132f37264600cc26e07c8d85dfdd6c969f0)
|
|
|
803fb7 |
---
|
|
|
803fb7 |
src/core/device.c | 2 ++
|
|
|
803fb7 |
1 file changed, 2 insertions(+)
|
|
|
803fb7 |
|
|
|
803fb7 |
diff --git a/src/core/device.c b/src/core/device.c
|
|
|
803fb7 |
index 75b9a4628..1cc103c29 100644
|
|
|
803fb7 |
--- a/src/core/device.c
|
|
|
803fb7 |
+++ b/src/core/device.c
|
|
|
803fb7 |
@@ -211,6 +211,8 @@ static int device_update_description(Unit *u, struct udev_device *dev, const cha
|
|
|
803fb7 |
j = strjoin(model, " ", label, NULL);
|
|
|
803fb7 |
if (j)
|
|
|
803fb7 |
r = unit_set_description(u, j);
|
|
|
803fb7 |
+ else
|
|
|
803fb7 |
+ r = -ENOMEM;
|
|
|
803fb7 |
} else
|
|
|
803fb7 |
r = unit_set_description(u, model);
|
|
|
803fb7 |
} else
|