]> git.ipfire.org Git - thirdparty/ulogd2.git/commitdiff
we forgot to set num_keys() correctly.
authorlaforge <laforge>
Thu, 24 Nov 2005 21:06:40 +0000 (21:06 +0000)
committerlaforge <laforge>
Thu, 24 Nov 2005 21:06:40 +0000 (21:06 +0000)
output/mysql/ulogd_output_MYSQL.c

index b3e63e084284f2e987d0495f7df63d7c7f66e8cd..f0c1509200fb2dc4e68b87aa5b5d776559b9a651 100644 (file)
@@ -337,12 +337,16 @@ static int mysql_get_columns(struct ulogd_pluginstance *upi)
        if (upi->input.keys) {
                free(upi->input.keys);
                upi->input.keys = NULL;
+               upi->input.num_keys = 0;
        }
 
+       upi->input.num_keys = mysql_field_count(mi->dbh);
        upi->input.keys = malloc(sizeof(struct ulogd_key) * 
-                                               mysql_field_count(mi->dbh));
-       if (!upi->input.keys)
+                                               upi->input.num_keys);
+       if (!upi->input.keys) {
+               upi->input.num_keys = 0;
                return -ENOMEM;
+       }
 
        i = 0;
        while ((field = mysql_fetch_field(result))) {