From 258eca377d21a7b88fbdabc6fcb7fee5ab364e22 Mon Sep 17 00:00:00 2001
From: Andreas Gustafsson <source@isc.org>
Date: Wed, 20 Feb 2002 01:06:19 +0000
Subject: [PATCH] pullup: 1207.   [bug]           libbind: getaddrinfo() could
 call freeaddrinfo() with                         an invalid pointer.

---
 CHANGES                    | 3 +++
 lib/bind/irs/getaddrinfo.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 1ed9630a79..a63095cc3e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 
 	--- 9.2.1rc1 released ---
 
+1207.	[bug]		libbind: getaddrinfo() could call freeaddrinfo() with
+			an invalid pointer.
+
 1205.	[bug]		OPT, TSIG and TKEY cannot be used to set the "class"
 			of the message. [RT #2449]
 
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;