pullup from BIND8:

1207.   [bug]           libbind: getaddrinfo() could call freeaddrinfo() with
                        an invalid pointer.

diff --git a/CHANGES b/CHANGES
index d0c20d063dcc81d82018980098beb94a77b5a56c..2178b0b989b1023aa818a222b29fa335b5e94ca3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1207.  [bug]           libbind: getaddrinfo() could call freeaddrinfo() with
+                       an invalid pointer.
+
 1206.  [bug]           SERVFAIL and NOTIMP responses to a EDNS should trigger
                        a non-EDNS retry.
 

diff --git a/lib/bind/irs/getaddrinfo.c b/lib/bind/irs/getaddrinfo.c
index f2c533d611c54bf7e6a23a6050261066084f559e..4dfe7f0d836d7a9276adcb822ac744030162de68 100644 (file)
--- a/lib/bind/irs/getaddrinfo.c
+++ b/lib/bind/irs/getaddrinfo.c
@@ -320,7 +320,7 @@ getaddrinfo(hostname, servname, hints, res)
        struct addrinfo sentinel;
        struct addrinfo *cur;
        int error = 0;
-       struct addrinfo ai, ai0, *afai;
+       struct addrinfo ai, ai0, *afai = NULL;
        struct addrinfo *pai;
        const struct explore *ex;