summaryrefslogtreecommitdiffstats
path: root/lib/libzfs
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2012-09-18 12:33:00 -0700
committerBrian Behlendorf <[email protected]>2012-09-18 12:33:37 -0700
commit0a2f7b3662fd10e7ac56a4b2859248eb98e31d6d (patch)
treefa2956a0b53e8e3ad69db764885927b8d9114306 /lib/libzfs
parent211204bed39a9652c95269cfef13be57d1507b71 (diff)
Seg fault 'zpool import -d /dev/disk/by-id -a'zfs-0.6.0-rc11
Introduced by commit 44867b6d6effc1628dd00c36821ab044f89fb988. We should of course check to ensure best isn't NULL before attempting to dereference it. Signed-off-by: Brian Behlendorf <[email protected]> Closes #974
Diffstat (limited to 'lib/libzfs')
-rw-r--r--lib/libzfs/libzfs_import.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libzfs/libzfs_import.c b/lib/libzfs/libzfs_import.c
index c2d87f830..b5cac6094 100644
--- a/lib/libzfs/libzfs_import.c
+++ b/lib/libzfs/libzfs_import.c
@@ -173,7 +173,7 @@ fix_paths(nvlist_t *nv, name_entry_t *names)
break;
}
- if (ne->ne_order < best->ne_order || best == NULL)
+ if (best == NULL || ne->ne_order < best->ne_order)
best = ne;
}
}