From 2675d6d8c4235730530339aa1625f386586cd6fc Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 19 Feb 2014 11:14:08 +0100 Subject: Re-introduce fix to va_arg list 64bit segfault. --- hugin.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hugin.c b/hugin.c index bc232f4..42369d8 100644 --- a/hugin.c +++ b/hugin.c @@ -407,14 +407,13 @@ int __debug(const char *func, const int line, // // Generate message // - va_list va; - va_start(va, fmt); - { + va_list va; + va_start(va, fmt); hdr_bufsz = scprintf(hdr_fmt, HDR_ARGS); msg_bufsz = vscprintf(fmt, va); if(hdr_bufsz < 0 || msg_bufsz < 0) return 1; // Bad format? - //va_end(va); + va_end(va); } buf = (char*)malloc(hdr_bufsz + msg_bufsz + 1); @@ -424,8 +423,8 @@ int __debug(const char *func, const int line, if(sz < 0) return 1; // Unknown error { - // va_list va; - // va_start(va, fmt); + va_list va; + va_start(va, fmt); sz = vsprintf(buf + sz, fmt, va); if(sz < 0) return 1; // Unknown error va_end(va); -- cgit v1.2.3