From owner-svn-src-head@FreeBSD.ORG  Mon Nov 25 20:45:31 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6EA1FC9F;
 Mon, 25 Nov 2013 20:45:31 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5E6F42837;
 Mon, 25 Nov 2013 20:45:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAPKjVMW028906;
 Mon, 25 Nov 2013 20:45:31 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAPKjVPY028905;
 Mon, 25 Nov 2013 20:45:31 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201311252045.rAPKjVPY028905@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Mon, 25 Nov 2013 20:45:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r258594 - head/lib/libnv
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.16
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Nov 2013 20:45:31 -0000

Author: pjd
Date: Mon Nov 25 20:45:30 2013
New Revision: 258594
URL: http://svnweb.freebsd.org/changeset/base/258594

Log:
  Fix double free().
  
  Reported by:	Coverity
  Coverity CID:	1130048

Modified:
  head/lib/libnv/nvpair.c

Modified: head/lib/libnv/nvpair.c
==============================================================================
--- head/lib/libnv/nvpair.c	Mon Nov 25 20:39:09 2013	(r258593)
+++ head/lib/libnv/nvpair.c	Mon Nov 25 20:45:30 2013	(r258594)
@@ -683,10 +683,8 @@ nvpair_unpack(int flags, const unsigned 
 	if (ptr == NULL)
 		goto failed;
 	tmp = realloc(nvp, sizeof(*nvp) + strlen(nvp->nvp_name) + 1);
-	if (tmp == NULL) {
-		free(nvp);
+	if (tmp == NULL)
 		goto failed;
-	}
 	nvp = tmp;
 	/* Update nvp_name after realloc(). */
 	nvp->nvp_name = (char *)(nvp + 1);