[systemd-commits] src/core

[Thomas H.P. Andersen]

 src/core/device.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7f629b74c4adc483dd5733bd9191b58cfbdd157f
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date:   Wed May 6 19:56:29 2015 +0200

    device: avoid null pointer dereference

diff --git a/src/core/device.c b/src/core/device.c
index 2c56c5a..c09ea6c 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -310,7 +310,7 @@ static int device_setup_unit(Manager *m, struct udev_device *dev, const char *pa
 
         r = unit_name_from_path(path, ".device", &e);
         if (r < 0)
-                return log_unit_error_errno(u->id, r, "Failed to generate device name: %m");
+                return log_error_errno(r, "Failed to generate unit name from device path: %m");
 
         u = manager_get_unit(m, e);