From bfe95ae476b66785e640d19a60541eff097b8673 Mon Sep 17 00:00:00 2001 From: avg Date: Fri, 13 Oct 2017 09:11:24 +0000 Subject: [PATCH] MFC r323528: MFV r323527: 5815 libzpool's panic function doesn't set global panicstr git-svn-id: svn://svn.freebsd.org/base/stable/10@324587 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- cddl/contrib/opensolaris/lib/libzpool/common/kernel.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c index eecfbae9c..54c957c1f 100644 --- a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c +++ b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c @@ -727,11 +727,9 @@ static char ce_suffix[CE_IGNORE][2] = { "", "\n", "\n", "" }; void vpanic(const char *fmt, va_list adx) { - (void) fprintf(stderr, "error: "); - (void) vfprintf(stderr, fmt, adx); - (void) fprintf(stderr, "\n"); - - abort(); /* think of it as a "user-level crash dump" */ + char buf[512]; + (void) vsnprintf(buf, 512, fmt, adx); + assfail(buf, NULL, 0); } void -- 2.45.0