From: LOLi <loli10K@users.noreply.github.com>
Date: Fri, 24 Mar 2017 01:57:54 +0000 (+0100)
Subject: Fix 'zdb -o' segmentation fault
X-Git-Tag: zfs-0.7.0-rc4~98
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b0dc2a317a3d149d396bc48dae7b8e9bf1a1a6b;p=zfs

Fix 'zdb -o' segmentation fault

Fix a regression accidentally introduced by OpenZFS 7280 in ed828c0: since
whether to accept NULL as a valid first parameter in strchr() is implementation
specific we add an additional check to avoid crashing.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
Closes #5917
---

diff --git a/lib/libzpool/util.c b/lib/libzpool/util.c
index 3bdc31722..8e1c104a3 100644
--- a/lib/libzpool/util.c
+++ b/lib/libzpool/util.c
@@ -182,7 +182,7 @@ set_global_var(char *arg)
 	    "little-endian systems\n");
 	return (ENOTSUP);
 #endif
-	if ((varval = strchr(arg, '=')) != NULL) {
+	if (arg != NULL && (varval = strchr(arg, '=')) != NULL) {
 		*varval = '\0';
 		varval++;
 		val = strtoull(varval, NULL, 0);