Commit b5e26537053 for php.net
commit b5e26537053bcd408b2367a0e0f0331c50125c59
Merge: e6013371d45 34a9a439043
Author: Ilia Alshanetsky <ilia@ilia.ws>
Date: Sun Jun 21 17:18:53 2026 -0400
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
ext/ftp: fix off-by-one terminator write in ftp_readline()
diff --cc ext/ftp/ftp.c
index f3b53fc4e0d,17a3e10e0d6..5fcd41536ec
--- a/ext/ftp/ftp.c
+++ b/ext/ftp/ftp.c
@@@ -1254,9 -1359,9 +1254,9 @@@ static bool ftp_readline(ftpbuf_t *ftp
}
data = eol;
- if ((rcvd = my_recv(ftp, ftp->fd, data, size)) < 1) {
+ if (size < 2 || (rcvd = my_recv(ftp, ftp->fd, data, size - 1)) < 1) {
*data = 0;
- return 0;
+ return false;
}
} while (size);