2478. [bug] 'addresses' could be used uninitalized in

                        configure_forward(). [RT 18800]

diff --git a/CHANGES b/CHANGES
index 939a31b405eb0bf873395e6cd74299e1cbb2ceb5..03a6fd6ecaeffdf96ade36e9a12c124806976ddc 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
-2477   [bug]           dig: the global option to print the command line is
+2478.  [bug]           'addresses' could be used uninitalized in
+                       configure_forward(). [RT 18800]
+       
+2477.  [bug]           dig: the global option to print the command line is
                        +cmd not print_cmd.  Update the output to reflect
                        this. [RT #17008]
 

diff --git a/bin/named/server.c b/bin/named/server.c
index 639416d55c18c8399ffa5331efa8b48014a4ff7a..304d003fd9b8013e91e4c20b86cb4b0f846ae92e 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.517 2008/09/27 23:35:31 jinmei Exp $ */
+/* $Id: server.c,v 1.518 2008/10/28 05:17:40 marka Exp $ */
 
 /*! \file */
 
@@ -2100,6 +2100,8 @@ configure_forward(const cfg_obj_t *config, dns_view_t *view, dns_name_t *origin,
        isc_result_t result;
        in_port_t port;
 
+       ISC_LIST_INIT(addresses);
+
        /*
         * Determine which port to send forwarded requests to.
         */
@@ -2125,8 +2127,6 @@ configure_forward(const cfg_obj_t *config, dns_view_t *view, dns_name_t *origin,
        if (forwarders != NULL)
                faddresses = cfg_tuple_get(forwarders, "addresses");
 
-       ISC_LIST_INIT(addresses);
-
        for (element = cfg_list_first(faddresses);
             element != NULL;
             element = cfg_list_next(element))