From owner-svn-src-head@freebsd.org  Thu Feb 11 17:48:16 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6B963AA468B;
 Thu, 11 Feb 2016 17:48:16 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3F214680;
 Thu, 11 Feb 2016 17:48:16 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1BHmF0Y053239;
 Thu, 11 Feb 2016 17:48:15 GMT (envelope-from des@FreeBSD.org)
Received: (from des@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1BHmF9v053238;
 Thu, 11 Feb 2016 17:48:15 GMT (envelope-from des@FreeBSD.org)
Message-Id: <201602111748.u1BHmF9v053238@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org
 using -f
From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= <des@FreeBSD.org>
Date: Thu, 11 Feb 2016 17:48:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r295536 - head/lib/libfetch
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Feb 2016 17:48:16 -0000

Author: des
Date: Thu Feb 11 17:48:15 2016
New Revision: 295536
URL: https://svnweb.freebsd.org/changeset/base/295536

Log:
  Fix double-free error: r289419 moved all error handling in http_connect()
  to the end of the function, but did not remove a fetch_close() call which
  was made redundant by the one in the shared error-handling code.
  
  PR:		206774
  Submitted by:	Christian Heckendorf <heckendorfc@gmail.com>
  MFC after:	3 days

Modified:
  head/lib/libfetch/http.c

Modified: head/lib/libfetch/http.c
==============================================================================
--- head/lib/libfetch/http.c	Thu Feb 11 17:37:02 2016	(r295535)
+++ head/lib/libfetch/http.c	Thu Feb 11 17:48:15 2016	(r295536)
@@ -1435,7 +1435,6 @@ http_connect(struct url *URL, struct url
 	}
 	if (strcasecmp(URL->scheme, SCHEME_HTTPS) == 0 &&
 	    fetch_ssl(conn, URL, verbose) == -1) {
-		fetch_close(conn);
 		/* grrr */
 		errno = EAUTH;
 		fetch_syserr();