improve fix for Bug #69545

diff --git a/NEWS b/NEWS
index effd8ffea47f6937e093796120d1d8d575a3bd52..3713ea9a0bae7d4d01d4574112219175db53d21a 100644 (file)
--- 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 53560eb1495e8312d85727f7d0ec223318ac32f3..50d8def77c93a546ffce0613feb94e052f93d0fb 100644 (file)
--- 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;
                }