4231. [contrib] Address unchecked calloc call in dlz_mysqldyn_mod.c.

                        [RT #40840]

diff --git a/CHANGES b/CHANGES
index a71edfb06a6fa3492396d3160c41bf5658dcf545..85b5c26424354951cad73be8c1bef8483ff872f9 100644 (file)
--- 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 3f360c3964b5df88d12d3cf4e017293dac2e6ada..9b037e47f81e56460c576b5eac3a6feab0599496 100644 (file)
--- 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)