From: Steve Dickson <steved@dickson.boston.devel.redhat.com>
Date: Thu, 17 Jan 2008 16:25:37 +0000 (-0500)
Subject: Stop segfaults on amd64 during warnings messages by creating
X-Git-Tag: nfs-utils-1-1-2~20
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=399cc3dad0cdfe8dca4a0ae9035a0554d7223eb2;ds=sidebyside

Stop segfaults on amd64 during warnings messages by creating
a second va_list in xlog_backend() and then use that va_list
to print messages on stderr.

Signed-off-by: Steinar H. Gunderson <sesse@debian.org>
Signed-off-by: Steve Langasek <vorlon@debian.org>
Signed-off-by: Steve Dickson <steved@dickson.boston.devel.redhat.com>
---

diff --git a/support/nfs/xlog.c b/support/nfs/xlog.c
index 26123c5..6820346 100644
--- a/support/nfs/xlog.c
+++ b/support/nfs/xlog.c
@@ -133,9 +133,14 @@ xlog_enabled(int fac)
 void
 xlog_backend(int kind, const char *fmt, va_list args)
 {
+	va_list args2;
+
 	if (!(kind & (L_ALL)) && !(logging && (kind & logmask)))
 		return;
 
+	if (log_stderr)
+		va_copy(args2, args);
+
 	if (log_syslog) {
 		switch (kind) {
 		case L_FATAL:
@@ -171,9 +176,9 @@ xlog_backend(int kind, const char *fmt, va_list args)
 #else
 		fprintf(stderr, "%s: ", log_name);
 #endif
-
-		vfprintf(stderr, fmt, args);
+		vfprintf(stderr, fmt, args2);
 		fprintf(stderr, "\n");
+		va_end(args2);
 	}
 
 	if (kind == L_FATAL)