Skip to content

bound host copy to its length in php_fopen_do_pasv #22203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alhudz wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −2
Open

bound host copy to its length in php_fopen_do_pasv #22203

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions ext/standard/ftp_fopen_wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,8 +361,14 @@ static unsigned short php_fopen_do_pasv(php_stream *stream, char *ip, size_t ip_
tpath++;
}
tpath[-1] = '\0';
memcpy(ip, hoststart, ip_size);
ip[ip_size-1] = '\0';
/* hoststart is now NUL-terminated; copy only its length so a long 227
* message can't drive the fixed-size read past the end of tmp_line */
size_t hostlen = (size_t)(tpath - 1 - hoststart);
if (hostlen >= ip_size) {
hostlen = ip_size - 1;
}
memcpy(ip, hoststart, hostlen);
ip[hostlen] = '\0';
hoststart = ip;

/* pull out the MSB of the port */
Expand Down
Loading