insist option != NULL and initalise last to NULL

diff --git a/bin/delv/delv.c b/bin/delv/delv.c
index 2e338e3b450326b4d1b08c58a1514039e3b6aeda..38af967357bb425cf46c7feb018139559cce0ae4 100644 (file)
--- a/bin/delv/delv.c
+++ b/bin/delv/delv.c
@@ -962,9 +962,11 @@ parse_uint(isc_uint32_t *uip, const char *value, isc_uint32_t max,
 static void
 plus_option(char *option) {
        isc_result_t result;
-       char *cmd, *value, *last;
+       char *cmd, *value, *last = NULL;
        isc_boolean_t state = ISC_TRUE;
 
+       INSIST(option != NULL);
+
        cmd = strtok_r(option, "=", &last);
        if (cmd == NULL) {
                printf(";; Invalid option %s\n", option);

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 4546e43e31568cccaa9077dd40f800e9b4007192..197718e8a41c5a174bf195537a9ef2a423b23789 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -735,11 +735,13 @@ plus_option(char *option, isc_boolean_t is_batchfile,
            dig_lookup_t *lookup)
 {
        isc_result_t result;
-       char *cmd, *value, *last, *code, *extra;
+       char *cmd, *value, *last = NULL, *code, *extra;
        isc_uint32_t num;
        isc_boolean_t state = ISC_TRUE;
        size_t n;
 
+       INSIST(option != NULL);
+
        if ((cmd = strtok_r(option, "=", &last)) == NULL) {
                printf(";; Invalid option %s\n", option);
                return;

diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c
index a915ec1e4a28122ff2873d0c27b5902dd5d64e9e..3b4c067c753ec1d340ab865dcc3264ab5a5c479d 100644 (file)
--- a/bin/tools/mdig.c
+++ b/bin/tools/mdig.c
@@ -1025,11 +1025,13 @@ static void
 plus_option(char *option, struct query *query, isc_boolean_t global)
 {
        isc_result_t result;
-       char *cmd, *value, *last, *code;
+       char *cmd, *value, *last = NULL, *code;
        isc_uint32_t num;
        isc_boolean_t state = ISC_TRUE;
        size_t n;
 
+       INSIST(option != NULL);
+
        if ((cmd = strtok_r(option, "=", &last)) == NULL) {
                printf(";; Invalid option %s\n", option);
                return;