diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-12-08 00:10:07 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-12-08 00:10:07 -0800 |
| commit | be19dbcb84fea0001e53cea2732c00de7ae6c371 (patch) | |
| tree | 294093130be3a028760f1b7e0b92aa286bbbb5c9 | |
| parent | 4bb422343f29f06b7081323844d9b52e1a71e4a5 (diff) | |
| download | php-git-be19dbcb84fea0001e53cea2732c00de7ae6c371.tar.gz | |
Fixed bug #70755: fpm_log.c memory leak and buffer overflow
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | sapi/fpm/fpm/fpm_log.c | 5 |
2 files changed, 8 insertions, 0 deletions
@@ -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 b0bf32ac16..187fe9bd07 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; } |