c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-27 11:29:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Illumos 1765 - assert triggered in libzfs_import.c

Browse Source 
1765 assert triggered in libzfs_import.c trying to import pool
name beginning with a number
Reviewed-by: Garrett D'Amore <garrett@damore.org>
Reviewed-by: Matthew Ahrens <mahrens@delphix.com>
Approved by: Robert Mustacchi <rm@joyent.com>

References:
  https://github.com/illumos/illumos-gate/commit/9edf9eb
  https://www.illumos.org/issues/1765

Ported-by: kernelOfTruth kerneloftruth@gmail.com
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #3562
This commit is contained in:
Prasad Joshi 2015-07-05 01:35:26 +02:00 committed by Brian Behlendorf
parent 0de7c552b6
commit eaa52d32b0
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/zpool/zpool_main.c
View File

@ -25,6 +25,7 @@
* Copyright (c) 2011, 2014 by Delphix. All rights reserved. * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
* Copyright (c) 2012 by Frederik Wessels. All rights reserved. * Copyright (c) 2012 by Frederik Wessels. All rights reserved.
* Copyright (c) 2012 by Cyril Plisko. All rights reserved. * Copyright (c) 2012 by Cyril Plisko. All rights reserved.
* Copyright (c) 2013 by Prasad Joshi (sTec). All rights reserved.
*/ */
#include <assert.h> #include <assert.h>
@ -2253,8 +2254,10 @@ zpool_do_import(int argc, char **argv)
errno = 0; errno = 0;
searchguid = strtoull(argv[0], &endptr, 10); searchguid = strtoull(argv[0], &endptr, 10);
if (errno != 0 || *endptr != '\0') if (errno != 0 || *endptr != '\0') {
searchname = argv[0]; searchname = argv[0];
searchguid = 0;
}
found_config = NULL; found_config = NULL;
/* /*