udevadm: info - fix info --root --query=name --path= for device without a device...

Subject: Bug#561279: udev: Crash location and first-level cause
Reply-To: Stephen Kitt <steve@sk2.org>, 561279@bugs.debian.org

diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c
index d95091c4a43edae87d1052eaba8cd5f92556b719..47114092d7ba1a7aaf80acaa4a9633c019557f00 100644 (file)
--- a/udev/udevadm-info.c
+++ b/udev/udevadm-info.c
@@ -388,23 +388,24 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
                }
 
                switch(query) {
-               case QUERY_NAME:
+               case QUERY_NAME: {
+                       const char *node = udev_device_get_devnode(device);
+
+                       if (node == NULL) {
+                               fprintf(stderr, "no device node found\n");
+                               rc = 5;
+                               goto exit;
+                       }
+
                        if (root) {
                                printf("%s\n", udev_device_get_devnode(device));
                        } else {
-                               size_t len;
-                               const char *node;
-
-                               len = strlen(udev_get_dev_path(udev));
-                               node = udev_device_get_devnode(device);
-                               if (node == NULL) {
-                                       fprintf(stderr, "no device node found\n");
-                                       rc = 5;
-                                       goto exit;
-                               }
-                                       printf("%s\n", &udev_device_get_devnode(device)[len+1]);
+                               size_t len = strlen(udev_get_dev_path(udev));
+
+                               printf("%s\n", &udev_device_get_devnode(device)[len+1]);
                        }
                        break;
+               }
                case QUERY_SYMLINK:
                        list_entry = udev_device_get_devlinks_list_entry(device);
                        while (list_entry != NULL) {