com php-src: Fixed va_list double used: sapi/fpm/fpm/ zlog.c
| From: | Xinchen Hui | Date: | Mon, 25 May 2015 07:40:32 +0000 |
| Subject: | com php-src: Fixed va_list double used: sapi/fpm/fpm/ zlog.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86950@lists.php.net to get a copy of this message | ||
Commit: 06483a98d6e1a6738c0b225741a400e088e4d6b0
Author: Xinchen Hui <laruence@gmail.com> Mon, 25 May 2015 15:40:32 +0800
Parents: 61f652a1798ecb9f9cda70cc0ca8021be52c7d2b
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=06483a98d6e1a6738c0b225741a400e088e4d6b0
Log:
Fixed va_list double used
Changed paths:
M sapi/fpm/fpm/zlog.c
Diff:
diff --git a/sapi/fpm/fpm/zlog.c b/sapi/fpm/fpm/zlog.c
index 66b7fd2..1659c77 100644
--- a/sapi/fpm/fpm/zlog.c
+++ b/sapi/fpm/fpm/zlog.c
@@ -108,7 +108,10 @@ void vzlog(const char *function, int line, int flags, const char *fmt, va_list
a
int saved_errno;
if (external_logger) {
- len = vsnprintf(buf, buf_size, fmt, args);
+ va_list ap;
+ va_copy(ap, args);
+ len = vsnprintf(buf, buf_size, fmt, ap);
+ va_end(ap);
if (len >= buf_size) {
memcpy(buf + buf_size - sizeof("..."), "...", sizeof("...") - 1);
len = buf_size - 1;