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 X-Patchwork-Id: 613833 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qs3w41v6Xz9t57 for ; Sat, 23 Apr 2016 04:25:56 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=cAaG8nnu; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; q=dns; s=default; b=F/ntJ1fT01nu3ieW6B4+0+Jq+NItU IsuyCeJp5n1+koU7rOgZdjwPpeiboke1M5YjREd3ZWz161EZSHEqgpU23zmnv4e5 UCiEMW/NSLrzWIIVgHeXPepYJEhSNIcY9Q8/rAqxte0ADtwac0E8wkvk+F4LahG/ aPdwpo4v6T3ZHg= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; s=default; bh=xxEacqZkdzIAyWp6/BpSp0cnrm4=; b=cAa G8nnuEXaiDNPAJmhB7umba2hc75dVuMT0DhD6HMEGYwhKr38WwbmnRpk/Eve7Dnn wKubBsQtMwlSuYLhup1+NVcvZwlCRdo3cgiEQx9KCPVGjwMOhfBMhb7ysBD8nBXA 6Lvn5VHV3DfTXy9rjPiRsEZX4U5Lyn04pjsHXxY4= 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: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , 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 To: libc-alpha@sourceware.org Subject: [PATCH] hesiod_end: Do not call res_nclose(&_res) [BZ #19573] Message-ID: User-Agent: Alpine 2.10 (DEB 1266 2009-07-14) MIME-Version: 1.0 2016-04-22 Anders Kaseorg [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); }