Issue 214: batch option parsing bug in tokstr library changes. versio…

…n 2.6.4 (#215)
dnsdb · Aug 5, 2022 · 181c588 · 181c588
1 parent 767b883
commit 181c588
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/dnsdbq.c b/dnsdbq.c
@@ -1130,7 +1130,7 @@ batch_options(const char *optstr, qparam_t options, qparam_ct dflt) {
 		/* dispense with extra spaces and tabs (empty fields). */
 		if (*tok == '\0')
 			continue;
-		*opt++ = tok;
+		*opt++ = strdup(tok);
 	}
 	tokstr_last(&ts);
 
@@ -1176,6 +1176,9 @@ batch_options(const char *optstr, qparam_t options, qparam_ct dflt) {
 			qparam_debug("batch", options);
 	}
 	/* done. */
+
+	for (int i = 0; i < opt - optv; i++)
+		free(optv[i]);
 	DESTROY(optv);
 	return msg;
 }

diff --git a/globals.h b/globals.h
@@ -34,7 +34,7 @@ extern const struct verb verbs[];
 #endif
 
 EXTERN	const char id_swclient[]	INIT("dnsdbq");
-EXTERN	const char id_version[]		INIT("2.6.3");
+EXTERN	const char id_version[]		INIT("2.6.4");
 EXTERN	const char *program_name	INIT(NULL);
 EXTERN	const char path_sort[]		INIT("/usr/bin/sort");
 EXTERN	const char json_header[]	INIT("Accept: application/json");