From d093c3cd8e78127fb0c0c94deb87e5f17218fe2e Mon Sep 17 00:00:00 2001
From: Marek Vavrusa <marek.vavrusa@nic.cz>
Date: Tue, 25 Jun 2013 14:57:48 +0200
Subject: [PATCH] Fixed using uninitialized lists when found duplicate zone in
config.
---
src/knot/conf/cf-parse.y | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/knot/conf/cf-parse.y b/src/knot/conf/cf-parse.y
index 87d9002edd..6d856ed186 100644
--- a/src/knot/conf/cf-parse.y
+++ b/src/knot/conf/cf-parse.y
@@ -328,6 +328,13 @@ static void conf_zone_start(void *scanner, char *name) {
this_zone->name = name; /* Already FQDN */
}
+ /* Initialize ACL lists. */
+ init_list(&this_zone->acl.xfr_in);
+ init_list(&this_zone->acl.xfr_out);
+ init_list(&this_zone->acl.notify_in);
+ init_list(&this_zone->acl.notify_out);
+ init_list(&this_zone->acl.update_in);
+
/* Check domain name. */
knot_dname_t *dn = NULL;
if (this_zone->name != NULL) {
@@ -357,13 +364,6 @@ static void conf_zone_start(void *scanner, char *name) {
*hattrie_get(new_config->names, (const char*)dn->name, dn->size) = (void *)1;
++new_config->zones_count;
knot_dname_free(&dn);
-
- /* Initialize ACL lists. */
- init_list(&this_zone->acl.xfr_in);
- init_list(&this_zone->acl.xfr_out);
- init_list(&this_zone->acl.notify_in);
- init_list(&this_zone->acl.notify_out);
- init_list(&this_zone->acl.update_in);
}
}
--
GitLab