insist option != NULL and initalise last to NULL

This commit is contained in:
Mark Andrews
2018-05-01 16:03:46 +10:00
committed by Ondřej Surý
parent 7f2863196f
commit 8801c65a4b
3 changed files with 9 additions and 3 deletions

View File

@@ -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);

View File

@@ -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;

View File

@@ -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;