Merge branch 'PHP-7.3' into PHP-7.4

cmb69 · cmb69 · commit e7bbac9d1136 · 2020-06-23T16:00:11.000+02:00
* PHP-7.3:
  Fix #55857: ftp_size on large files
diff --git a/NEWS b/NEWS
@@ -1,5 +1,10 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? ??? 2020, PHP 7.4.9
+
+- FTP:
+  . Fixed bug #55857 (ftp_size on large files). (cmb)
+
 ?? ??? 2020, PHP 7.4.8
 
 - Core:
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
@@ -1133,6 +1133,8 @@ ftp_append(ftpbuf_t *ftp, const char *path, const size_t path_len, php_stream *i
 zend_long
 ftp_size(ftpbuf_t *ftp, const char *path, const size_t path_len)
 {
+	zend_long res;
+
 	if (ftp == NULL) {
 		return -1;
 	}
@@ -1145,7 +1147,8 @@ ftp_size(ftpbuf_t *ftp, const char *path, const size_t path_len)
 	if (!ftp_getresp(ftp) || ftp->resp != 213) {
 		return -1;
 	}
-	return atol(ftp->inbuf);
+	ZEND_ATOL(res, ftp->inbuf);
+	return res;
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -1133,6 +1133,8 @@ ftp_append(ftpbuf_t ftp, const char path, const size_t path_len, php_stream *i`
`1133`	`1133`	`zend_long`
`1134`	`1134`	`ftp_size(ftpbuf_t ftp, const char path, const size_t path_len)`
`1135`	`1135`	`{`
	`1136`	`+ zend_long res;`
	`1137`	`+`
`1136`	`1138`	`if (ftp == NULL) {`
`1137`	`1139`	`return -1;`
`1138`	`1140`	`}`
`@@ -1145,7 +1147,8 @@ ftp_size(ftpbuf_t ftp, const char path, const size_t path_len)`
`1145`	`1147`	`if (!ftp_getresp(ftp) \|\| ftp->resp != 213) {`
`1146`	`1148`	`return -1;`
`1147`	`1149`	`}`
`1148`		`- return atol(ftp->inbuf);`
	`1150`	`+ ZEND_ATOL(res, ftp->inbuf);`
	`1151`	`+ return res;`
`1149`	`1152`	`}`
`1150`	`1153`	`/* }}} */`
`1151`	`1154`