From: Kay Sievers Date: Wed, 15 Oct 2008 14:55:04 +0000 (+0200) Subject: libudev: monitor - do not mangle DEVLINKS property X-Git-Tag: 174~1455 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e61ff54f52c89c1ec0cffd595dc9b1980df2be4;p=systemd libudev: monitor - do not mangle DEVLINKS property --- diff --git a/udev/lib/libudev-monitor.c b/udev/lib/libudev-monitor.c index ccfcd6af..dd8dfac3 100644 --- a/udev/lib/libudev-monitor.c +++ b/udev/lib/libudev-monitor.c @@ -320,9 +320,13 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito } else if (strncmp(key, "DEVNAME=", 8) == 0) { udev_device_set_devnode(udev_device, &key[8]); } else if (strncmp(key, "DEVLINKS=", 9) == 0) { - char *slink = &key[9]; - char *next = strchr(slink, ' '); + char devlinks[UTIL_PATH_SIZE]; + char *slink; + char *next; + util_strlcpy(devlinks, &key[9], sizeof(devlinks)); + slink = devlinks; + next = strchr(slink, ' '); while (next != NULL) { next[0] = '\0'; udev_device_add_devlink(udev_device, slink); @@ -356,9 +360,7 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito udev_device_unref(udev_device); return NULL; } - udev_device_set_devnum(udev_device, makedev(maj, min)); - udev_device_set_info_loaded(udev_device); return udev_device; }