Merge branch 'PHP-7.4'

cmb69 · cmb69 · commit 9bd648ba1e54 · 2020-06-23T16:02:19.000+02:00
* PHP-7.4:
  Fix #55857: ftp_size on large files
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
@@ -1131,6 +1131,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;
 	}
@@ -1143,7 +1145,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
`@@ -1131,6 +1131,8 @@ ftp_append(ftpbuf_t ftp, const char path, const size_t path_len, php_stream *i`
`1131`	`1131`	`zend_long`
`1132`	`1132`	`ftp_size(ftpbuf_t ftp, const char path, const size_t path_len)`
`1133`	`1133`	`{`
	`1134`	`+ zend_long res;`
	`1135`	`+`
`1134`	`1136`	`if (ftp == NULL) {`
`1135`	`1137`	`return -1;`
`1136`	`1138`	`}`
`@@ -1143,7 +1145,8 @@ ftp_size(ftpbuf_t ftp, const char path, const size_t path_len)`
`1143`	`1145`	`if (!ftp_getresp(ftp) \|\| ftp->resp != 213) {`
`1144`	`1146`	`return -1;`
`1145`	`1147`	`}`
`1146`		`- return atol(ftp->inbuf);`
	`1148`	`+ ZEND_ATOL(res, ftp->inbuf);`
	`1149`	`+ return res;`
`1147`	`1150`	`}`
`1148`	`1151`	`/* }}} */`
`1149`	`1152`