svn commit: r247858 - projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Xin LI]

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);