From: Bill Parker <wp02855@gmail.com>
Date: Wed, 11 Jul 2018 03:48:08 +0000 (+1000)
Subject: check code is non NULL
X-Git-Tag: v9.13.3~108^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=408bcf9c070c202c3d39eacd902bd4e79a8e9a51;p=thirdparty%2Fbind9.git

check code is non NULL
---

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 5b4e8a78c26..a09263f46e0 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -1001,14 +1001,20 @@ plus_option(char *option, isc_boolean_t is_batchfile,
 							lookup->ednsoptscnt = 0;
 							break;
 						}
-						if (value == NULL) {
+						code = NULL;
+						if (value != NULL) {
+							code = strtok_r(value,
+								        ":",
+									&last);
+						}
+						if (code == NULL) {
 							warn("ednsopt no "
 							     "code point "
 							     "specified");
 							goto exit_or_usage;
 						}
-						code = strtok_r(value, ":", &last);
-						extra = strtok_r(NULL, "\0", &last);
+						extra = strtok_r(NULL, "\0",
+								 &last);
 						save_opt(lookup, code, extra);
 						break;
 					default: