summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2015-12-08 00:10:07 -0800
committerAnatol Belski <ab@php.net>2016-01-05 13:33:36 +0100
commit2721a0148649e07ed74468f097a28899741eb58f (patch)
treeafa7ec7d1eab4936893afb0213983c0863bde72d
parent56839f5a76fe76c2856aef3ea2bdce98de847891 (diff)
downloadphp-git-2721a0148649e07ed74468f097a28899741eb58f.tar.gz
Fixed bug #70755: fpm_log.c memory leak and buffer overflow
-rw-r--r--sapi/fpm/fpm/fpm_log.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sapi/fpm/fpm/fpm_log.c b/sapi/fpm/fpm/fpm_log.c
index 86332c4c80..5aad9a08c9 100644
--- a/sapi/fpm/fpm/fpm_log.c
+++ b/sapi/fpm/fpm/fpm_log.c
@@ -448,6 +448,11 @@ int fpm_log_write(char *log_format) /* {{{ */
b += len2;
len += len2;
}
+ if (len >= FPM_LOG_BUFFER) {
+ zlog(ZLOG_NOTICE, "the log buffer is full (%d). The access log request has been truncated.", FPM_LOG_BUFFER);
+ len = FPM_LOG_BUFFER;
+ break;
+ }
continue;
}