com php-src: Fixed bug #70755: fpm_log.c memory leak and buffer overflow: sapi/fpm/fpm/fpm_log.c
| From: | Anatol Belski | Date: | Tue, 05 Jan 2016 12:33:36 +0000 |
| Subject: | com php-src: Fixed bug #70755: fpm_log.c memory leak and buffer overflow: sapi/fpm/fpm/fpm_log.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90547@lists.php.net to get a copy of this message | ||
Commit: 2721a0148649e07ed74468f097a28899741eb58f
Author: Stanislav Malyshev <stas@php.net> Tue, 8 Dec 2015 00:10:07 -0800
Committer: Anatol Belski <ab@php.net> Tue, 5 Jan 2016 13:33:36 +0100
Parents: 56839f5a76fe76c2856aef3ea2bdce98de847891
Branches: PHP-7.0.2
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2721a0148649e07ed74468f097a28899741eb58f
Log:
Fixed bug #70755: fpm_log.c memory leak and buffer overflow
Bugs:
https://bugs.php.net/70755
Changed paths:
M sapi/fpm/fpm/fpm_log.c
Diff:
diff --git a/sapi/fpm/fpm/fpm_log.c b/sapi/fpm/fpm/fpm_log.c
index 86332c4..5aad9a0 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;
}