summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS4
-rw-r--r--ext/ftp/ftp.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index effd8ffea4..3713ea9a0b 100644
--- a/NEWS
+++ b/NEWS
@@ -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;
}