[Bug 1851] freeaddrinfo() called after getaddrinfo() fails.

bk: 4dacbc00SXCVV2zrSrfO-iPQZawQ0A

diff --git a/ChangeLog b/ChangeLog
index ed2f7cc8061065e10def351493f1cd6e2d9600e7..e1726d65481f282ff8c982594114974080237e70 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1851] freeaddrinfo() called after getaddrinfo() fails.
 (4.2.7p155) 2011/04/18 Released by Harlan Stenn <stenn@ntp.org>
 * Fix leak in refclock_datum.c start failure path.
 (4.2.7p154) 2011/04/17 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/libntp/ntp_intres.c b/libntp/ntp_intres.c
index 8ecb4870b382f7bf49c4fadf759c265284a58f28..b3d0359bf046b0d209429ccacfbc26222153a026 100644 (file)
--- a/libntp/ntp_intres.c
+++ b/libntp/ntp_intres.c
@@ -358,7 +358,7 @@ blocking_getaddrinfo(
 #endif
        canons_octets = 0;
 
-       if (!gai_resp->retcode) {
+       if (0 == gai_resp->retcode) {
                ai = ai_res;
                while (NULL != ai) {
                        gai_resp->ai_count++;
@@ -400,7 +400,7 @@ blocking_getaddrinfo(
        cp = (void *)(gai_resp + 1);
        canons_octets = 0;
 
-       if (!gai_resp->retcode) {
+       if (0 == gai_resp->retcode) {
                ai = ai_res;
                while (NULL != ai) {
                        memcpy(cp, ai, sizeof(*ai));
@@ -437,6 +437,7 @@ blocking_getaddrinfo(
 
                        ai = ai->ai_next;
                }
+               freeaddrinfo(ai_res);
        }
 
        /*
@@ -505,7 +506,7 @@ getaddrinfo_sometime_complete(
                /*
                 * exponential backoff of DNS retries to 64s
                 */
-               if (gai_req->retry && again) {
+               if (gai_req->retry > 0 && again) {
                        /* log the first retry only */
                        if (INITIAL_DNS_RETRY == gai_req->retry)
                                NLOG(NLOG_SYSINFO) {
@@ -745,7 +746,7 @@ blocking_getnameinfo(
                gni_resp->gni_errno = errno;
 #endif
 
-       if (gni_resp->retcode) {
+       if (0 != gni_resp->retcode) {
                gni_resp->hostoctets = 0;
                gni_resp->servoctets = 0;
        } else {
@@ -780,7 +781,7 @@ blocking_getnameinfo(
        /* cp serves as our current pointer while serializing */
        cp = (void *)(gni_resp + 1);
 
-       if (!gni_resp->retcode) {
+       if (0 == gni_resp->retcode) {
                memcpy(cp, host, gni_resp->hostoctets);
                cp += gni_resp->hostoctets;
                memcpy(cp, service, gni_resp->servoctets);
@@ -840,12 +841,12 @@ getnameinfo_sometime_complete(
                /*
                 * exponential backoff of DNS retries to 64s
                 */
-               if (gni_req->retry)
+               if (gni_req->retry > 0)
                        manage_dns_retry_interval(&gni_req->scheduled,
                            &gni_req->earliest, &gni_req->retry,
                            &child_ctx->next_dns_timeslot);
 
-               if (gni_req->retry && again) {
+               if (gni_req->retry > 0 && again) {
                        if (!queue_blocking_request(
                                BLOCKING_GETNAMEINFO,
                                gni_req,