From: Florian Weimer <fweimer@redhat.com>
Date: Thu, 3 Aug 2017 10:33:00 +0000 (+0200)
Subject: getaddrinfo: Release resolver context on error in gethosts [BZ #21885]
X-Git-Tag: glibc-2.27~1241
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=964263bb8d650f1681665c55704fb01a8e725621;p=thirdparty%2Fglibc.git

getaddrinfo: Release resolver context on error in gethosts [BZ #21885]
---

diff --git a/ChangeLog b/ChangeLog
index 4565de26443..63494ae75a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-08-03  Florian Weimer  <fweimer@redhat.com>
+
+	[BZ #21885]
+	* sysdeps/posix/getaddrinfo.c (gethosts): Release resolver context
+	on memory allocation failure.
+
 2017-08-03  Alan Modra  <amodra@gmail.com>
 
 	* sysdeps/powerpc/mod-tlsopt-powerpc.c: Extract from
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index efa71184989..699411cc92f 100644
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -255,6 +255,8 @@ convert_hostent_to_gaih_addrtuple (const struct addrinfo *req,
       break;								      \
     if (!scratch_buffer_grow (tmpbuf))					      \
       {									      \
+	__resolv_context_enable_inet6 (res_ctx, res_enable_inet6);	      \
+	__resolv_context_put (res_ctx);					      \
 	result = -EAI_MEMORY;						      \
 	goto free_and_return;						      \
       }									      \