From patchwork Fri Apr 22 18:25:41 2016
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Anders Kaseorg <andersk@MIT.EDU>
X-Patchwork-Id: 11859
Received: (qmail 106364 invoked by alias); 22 Apr 2016 18:25:49 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: <mailto:libc-alpha-unsubscribe-##L=##H@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 106322 invoked by uid 89); 22 Apr 2016 18:25:48 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-2.9 required=5.0 tests=BAYES_00,
	RP_MATCHES_RCVD,
	SPF_PASS autolearn=ham version=3.3.2 spammy=H*r:User,
	H*r:sk:outgoin, H*RU:sk:outgoin,
	Hx-spam-relays-external:sk:outgoin
X-HELO: dmz-mailsec-scanner-2.mit.edu
Date: Fri, 22 Apr 2016 14:25:41 -0400 (EDT)
From: Anders Kaseorg <andersk@mit.edu>
To: libc-alpha@sourceware.org
Subject: [PATCH] hesiod_end: Do not call res_nclose(&_res) [BZ #19573]
Message-ID: <alpine.DEB.2.10.1604221400580.60537@buzzword-bingo.mit.edu>
User-Agent: Alpine 2.10 (DEB 1266 2009-07-14)
MIME-Version: 1.0

2016-04-22  Anders Kaseorg  <andersk@mit.edu>

	[BZ #19573]
	* hesiod/hesiod.c (hesiod_end): Only call res_nclose(ctx->res) if
	ctx->free_res is nonnull, to prevent a crash on res_nclose(&res)
	introduced by commit 2212c1420c92a33b0e0bd9a34938c9814a56c0f7
	(Simplify handling of nameserver configuration in resolver).

diff --git a/hesiod/hesiod.c b/hesiod/hesiod.c
index 657dabe..a540382 100644
--- a/hesiod/hesiod.c
+++ b/hesiod/hesiod.c
@@ -152,12 +152,12 @@ hesiod_end(void *context) {
 	struct hesiod_p *ctx = (struct hesiod_p *) context;
 	int save_errno = errno;
 
-	if (ctx->res)
+	if (ctx->res && ctx->free_res) {
 		res_nclose(ctx->res);
+		(*ctx->free_res)(ctx->res);
+	}
 	free(ctx->RHS);
 	free(ctx->LHS);
-	if (ctx->res && ctx->free_res)
-		(*ctx->free_res)(ctx->res);
 	free(ctx);
 	__set_errno(save_errno);
 }