diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-01-05 19:37:29 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-01-05 19:38:29 -0800 |
| commit | 13750cb0a15d8e1744f6de85b85c73f0b9939dad (patch) | |
| tree | 2123a8e8efab48e7977f5290ceb90bfa46128cd3 /sapi | |
| parent | 53fb2f1e5c6037a5182c2e0dcd5bac7ecdb7c150 (diff) | |
| parent | 74dcbe12997132353fd75d0c14548cff5235329f (diff) | |
| download | php-git-13750cb0a15d8e1744f6de85b85c73f0b9939dad.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Update NEWS
Improve fix for bug #70976
Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
Fixed bug #70741: Session WDDX Packet Deserialization Type Confusion Vulnerability
Fixed #70728
Fixed bug #70755: fpm_log.c memory leak and buffer overflow
Fix bug #70976: fix boundary check on gdImageRotateInterpolated
typofix
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/fpm/fpm/fpm_log.c | 5 |
1 files changed, 5 insertions, 0 deletions
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; } |