com php-src: Fixed bug #70755: fpm_log.c memory leak and buffer overflow: NEWS sapi/fpm/fpm/fpm_log.c
| From: | Stanislav Malyshev | Date: | Tue, 08 Dec 2015 08:10:07 +0000 |
| Subject: | com php-src: Fixed bug #70755: fpm_log.c memory leak and buffer overflow: NEWS sapi/fpm/fpm/fpm_log.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90523@lists.php.net to get a copy of this message | ||
Commit: be19dbcb84fea0001e53cea2732c00de7ae6c371
Author: Stanislav Malyshev <stas@php.net> Tue, 8 Dec 2015 00:10:07 -0800
Parents: 4bb422343f29f06b7081323844d9b52e1a71e4a5
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=be19dbcb84fea0001e53cea2732c00de7ae6c371
Log:
Fixed bug #70755: fpm_log.c memory leak and buffer overflow
Bugs:
https://bugs.php.net/70755
Changed paths:
M NEWS
M sapi/fpm/fpm/fpm_log.c
Diff:
diff --git a/NEWS b/NEWS
index d9fcf14..f29a710 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,9 @@ PHP NEWS
?? ??? 2015, PHP 5.5.31
+- FPM:
+ . Fixed bug #70755 (fpm_log.c memory leak and buffer overflow). (Stas)
+
- GD:
. Fixed bug #70976 (Memory Read via gdImageRotateInterpolated Array Index
Out of Bounds). (emmanuel dot law at gmail dot com).
diff --git a/sapi/fpm/fpm/fpm_log.c b/sapi/fpm/fpm/fpm_log.c
index b0bf32a..187fe9b 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 TSRMLS_DC) /* {{{ */
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;
}