From: Mark Andrews <marka@isc.org>
Date: Mon, 29 Aug 2011 23:21:48 +0000 (+0000)
Subject: query could be tested uninitialised, check the result of dns_message_create
X-Git-Tag: v9.9.0a2~1^2~88
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=90306774dcf4b7be85e354bdc9ebe3c1b5f2f81c;p=thirdparty%2Fbind9.git

query could be tested uninitialised, check the result of dns_message_create
---

diff --git a/bin/tests/dst/gsstest.c b/bin/tests/dst/gsstest.c
index fcdd8086c47..4e5a6016705 100755
--- a/bin/tests/dst/gsstest.c
+++ b/bin/tests/dst/gsstest.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gsstest.c,v 1.16 2011/03/28 05:14:51 marka Exp $ */
+/* $Id: gsstest.c,v 1.17 2011/08/29 23:21:48 marka Exp $ */
 
 #include <config.h>
 
@@ -146,14 +146,14 @@ recvresponse(isc_task_t *task, isc_event_t *event) {
 
 	REQUIRE(reqev != NULL);
 
+	query = reqev->ev_arg;
+
 	if (reqev->result != ISC_R_SUCCESS) {
 		fprintf(stderr, "I:request event result: %s\n",
 			isc_result_totext(reqev->result));
 		goto end;
 	}
 
-	query = reqev->ev_arg;
-
 	response = NULL;
 	result = dns_message_create(mctx, DNS_MESSAGE_INTENTPARSE, &response);
 	CHECK("dns_message_create", result);
@@ -174,7 +174,7 @@ recvresponse(isc_task_t *task, isc_event_t *event) {
 	if (response)
 		dns_message_destroy(&response);
 
-end:
+ end:
 	if (query)
 		dns_message_destroy(&query);
 
@@ -220,6 +220,8 @@ sendquery(isc_task_t *task, isc_event_t *event)
 	CHECK("dns_name_fromtext", result);
 
 	result = dns_message_create(mctx, DNS_MESSAGE_INTENTRENDER, &message);
+	if (result != ISC_R_SUCCESS)
+		goto end;
 
 	message->opcode = dns_opcode_query;
 	message->rdclass = dns_rdataclass_in;
@@ -256,13 +258,13 @@ sendquery(isc_task_t *task, isc_event_t *event)
 
 	return;
 
-	end:
-		if (qname != NULL)
-			dns_message_puttempname(message, &qname);
-		if (qrdataset != NULL)
-			dns_message_puttemprdataset(message, &qrdataset);
-		if (message != NULL)
-			dns_message_destroy(&message);
+ end:
+	if (qname != NULL)
+		dns_message_puttempname(message, &qname);
+	if (qrdataset != NULL)
+		dns_message_puttemprdataset(message, &qrdataset);
+	if (message != NULL)
+		dns_message_destroy(&message);
 }
 
 static void
@@ -280,14 +282,14 @@ initctx2(isc_task_t *task, isc_event_t *event) {
 
 	REQUIRE(reqev != NULL);
 
+	query = reqev->ev_arg;
+
 	if (reqev->result != ISC_R_SUCCESS) {
 		fprintf(stderr, "I:request event result: %s\n",
 			isc_result_totext(reqev->result));
 		goto end;
 	}
 
-	query = reqev->ev_arg;
-
 	response = NULL;
 	result = dns_message_create(mctx, DNS_MESSAGE_INTENTPARSE, &response);
 	CHECK("dns_message_create", result);
@@ -331,7 +333,7 @@ initctx2(isc_task_t *task, isc_event_t *event) {
 	if (response)
 		dns_message_destroy(&response);
 
-end:
+ end:
 	if (query)
 		dns_message_destroy(&query);
 
@@ -406,7 +408,7 @@ initctx1(isc_task_t *task, isc_event_t *event) {
 	CHECK("dns_request_create", result);
 
 	return;
-end:
+ end:
 	event = isc_event_allocate(mctx, (void *)1, 1, console, NULL,
 				   sizeof(*event));
 	isc_task_send(task, &event);return;