From owner-svn-src-head@freebsd.org  Wed May 11 23:39:41 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 27838B37110;
 Wed, 11 May 2016 23:39:41 +0000 (UTC) (envelope-from cem@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 E8C861F97;
 Wed, 11 May 2016 23:39:40 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4BNdexX062988;
 Wed, 11 May 2016 23:39:40 GMT (envelope-from cem@FreeBSD.org)
Received: (from cem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4BNdehd062987;
 Wed, 11 May 2016 23:39:40 GMT (envelope-from cem@FreeBSD.org)
Message-Id: <201605112339.u4BNdehd062987@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org
 using -f
From: "Conrad E. Meyer" <cem@FreeBSD.org>
Date: Wed, 11 May 2016 23:39:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r299496 - head/contrib/atf/atf-c/detail
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.22
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: Wed, 11 May 2016 23:39:41 -0000

Author: cem
Date: Wed May 11 23:39:39 2016
New Revision: 299496
URL: https://svnweb.freebsd.org/changeset/base/299496

Log:
  atf map: Fix double-free in low memory error path
  
  If atf_list_append(, X, ) fails, X is freed.  Don't free it again.
  
  If anyone wants to walk this patch upstream, be my guest.  I literally cannot
  upstream it myself due to Google's stupid CLA.
  
  Reported by:	Coverity
  CID:		979936
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/contrib/atf/atf-c/detail/map.c

Modified: head/contrib/atf/atf-c/detail/map.c
==============================================================================
--- head/contrib/atf/atf-c/detail/map.c	Wed May 11 23:25:59 2016	(r299495)
+++ head/contrib/atf/atf-c/detail/map.c	Wed May 11 23:39:39 2016	(r299496)
@@ -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 {