From owner-svn-src-projects@FreeBSD.ORG  Tue Mar  5 22:58:53 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id BDD28C16;
 Tue,  5 Mar 2013 22:58:53 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9940120D;
 Tue,  5 Mar 2013 22:58:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r25Mwrhe062388;
 Tue, 5 Mar 2013 22:58:53 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r25Mwrj9062387;
 Tue, 5 Mar 2013 22:58:53 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201303052258.r25Mwrj9062387@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 5 Mar 2013 22:58:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r247858 -
 projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Mar 2013 22:58:53 -0000

Author: delphij
Date: Tue Mar  5 22:58:53 2013
New Revision: 247858
URL: http://svnweb.freebsd.org/changeset/base/247858

Log:
  Use adx2 instead of adx in the second vsprintf, this fixes a
  panic.

Modified:
  projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c

Modified: projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c
==============================================================================
--- projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c	Tue Mar  5 22:51:11 2013	(r247857)
+++ projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c	Tue Mar  5 22:58:53 2013	(r247858)
@@ -450,7 +450,7 @@ log_internal(nvlist_t *nvl, const char *
 	va_copy(adx2, adx);
 
 	msg = kmem_alloc(vsnprintf(NULL, 0, fmt, adx) + 1, KM_SLEEP);
-	(void) vsprintf(msg, fmt, adx);
+	(void) vsprintf(msg, fmt, adx2);
 	fnvlist_add_string(nvl, ZPOOL_HIST_INT_STR, msg);
 	strfree(msg);