From: Mark Andrews <marka@isc.org>
Date: Wed, 30 Sep 2015 05:38:32 +0000 (+1000)
Subject: 4231.   [contrib]       Address unchecked calloc call in dlz_mysqldyn_mod.c.
X-Git-Tag: v9.11.0a1~401
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=09f4e41912d08b5c1685f4d23bd19d32f63db935;p=thirdparty%2Fbind9.git

4231.   [contrib]       Address unchecked calloc call in dlz_mysqldyn_mod.c.
                        [RT #40840]
---

diff --git a/CHANGES b/CHANGES
index a71edfb06a6..85b5c264243 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4231.	[contrib]	Address unchecked calloc call in dlz_mysqldyn_mod.c.
+			[RT #40840]
+
 4230.	[contrib]	dlz_wildcard_dynamic.c:dlz_create could return a
 			uninitalised result. [RT #40839]
 
diff --git a/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c b/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c
index 3f360c3964b..9b037e47f81 100644
--- a/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c
+++ b/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c
@@ -377,7 +377,7 @@ build_query(mysql_data_t *state, mysql_instance_t *dbi,
 	isc_boolean_t localdbi = ISC_FALSE;
 	mysql_arglist_t arglist;
 	mysql_arg_t *item;
-	char *p, *q, *tmp, *querystr;
+	char *p, *q, *tmp, *querystr = NULL;
 	char *query = NULL;
 	size_t len = 0;
 	const char *arg;
@@ -923,12 +923,12 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[],
 	UNUSED(dlzname);
 
 	state = calloc(1, sizeof(mysql_data_t));
-	dlz_mutex_init(&state->tx_mutex, NULL);
-	state->transactions=NULL;
-
 	if (state == NULL)
 		return (ISC_R_NOMEMORY);
 
+	dlz_mutex_init(&state->tx_mutex, NULL);
+	state->transactions = NULL;
+
 	/* Fill in the helper functions */
 	va_start(ap, dbdata);
 	while ((helper_name = va_arg(ap, const char *)) != NULL)