diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-05-31 17:23:06 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-05-31 17:29:00 -0700 |
| commit | 0765623d6991b62ffcd93ddb6be8a5203a2fa7e2 (patch) | |
| tree | 0696116bb69bdf2ad0e5d14119ee4cb8b90038bc | |
| parent | f38ca75a3cc5737bdb922dc5e2a7505cd20cd7ea (diff) | |
| download | php-git-0765623d6991b62ffcd93ddb6be8a5203a2fa7e2.tar.gz | |
improve fix for Bug #69545
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/ftp/ftp.c | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -2,6 +2,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2015 PHP 5.4.42 +- Core: + . Imroved fix for bug #69545 (Integer overflow in ftp_genlist() resulting in + heap overflow). (Max Spelsberg) + - Postgres: . Fixed bug #69667 (segfault in php_pgsql_meta_data). (Remi) diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c index 53560eb149..50d8def77c 100644 --- a/ext/ftp/ftp.c +++ b/ext/ftp/ftp.c @@ -1668,8 +1668,6 @@ ftp_genlist(ftpbuf_t *ftp, const char *cmd, const char *path TSRMLS_DC) for (ptr = data->buf; rcvd; rcvd--, ptr++) { if (*ptr == '\n' && lastch == '\r') { lines++; - } else { - size++; } lastch = *ptr; } |