From owner-svn-src-stable@freebsd.org  Fri Jun 10 14:51:12 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 6886EB716C2;
 Fri, 10 Jun 2016 14:51:12 +0000 (UTC)
 (envelope-from ngie@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 3A89E18D5;
 Fri, 10 Jun 2016 14:51:12 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5AEpBDF049179;
 Fri, 10 Jun 2016 14:51:11 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5AEpBC5049178;
 Fri, 10 Jun 2016 14:51:11 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201606101451.u5AEpBC5049178@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Fri, 10 Jun 2016 14:51:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r301793 - stable/10/contrib/atf/atf-c/detail
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jun 2016 14:51:12 -0000

Author: ngie
Date: Fri Jun 10 14:51:11 2016
New Revision: 301793
URL: https://svnweb.freebsd.org/changeset/base/301793

Log:
  MFC r299496:
  r299496 (by cem):
  
  atf map: Fix double-free in low memory error path
  
  If atf_list_append(, X, ) fails, X is freed.  Don't free it again.
  
  CID:		979936

Modified:
  stable/10/contrib/atf/atf-c/detail/map.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/atf/atf-c/detail/map.c
==============================================================================
--- stable/10/contrib/atf/atf-c/detail/map.c	Fri Jun 10 14:48:10 2016	(r301792)
+++ stable/10/contrib/atf/atf-c/detail/map.c	Fri Jun 10 14:51:11 2016	(r301793)
@@ -360,7 +360,6 @@ atf_map_insert(atf_map_t *m, const char 
             if (atf_is_error(err)) {
                 if (managed)
                     free(value);
-                free(me);
             }
         }
     } else {