Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Feb 2016 17:48:15 +0000 (UTC)
From:      =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= <des@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r295536 - head/lib/libfetch
Message-ID:  <201602111748.u1BHmF9v053238@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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();



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602111748.u1BHmF9v053238>