X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=23961249ff595b857b327a34f025e31c64a97d1d;hp=43171eb7e1d7f0e2f6ec95392d364597dfa8c1cf;hb=198c4e575e177ae5458238e7b474361506a6f302;hpb=1b50985db4e85030de3567792aedc13aa26e0fea

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 43171eb..2396124 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -235,6 +235,9 @@ static int mount_device(struct discover_device *dev)
 {
 	const char *argv[6];
 
+	if (!dev->device_path)
+		return -1;
+
 	if (!dev->mount_path)
 		dev->mount_path = join_paths(dev, mount_base(),
 						dev->device_path);
@@ -576,7 +579,7 @@ void device_handler_destroy(struct device_handler *handler)
 
 static int device_match_path(struct discover_device *dev, const char *path)
 {
-	return !strcmp(dev->device_path, path);
+	return dev->device_path && !strcmp(dev->device_path, path);
 }
 
 static int device_match_uuid(struct discover_device *dev, const char *uuid)