diff --git a/CHANGES b/CHANGES
index d0c20d063d..2178b0b989 100644
--- 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 f2c533d611..4dfe7f0d83 100644
--- 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;