Skip to content

Fix SFTP path corruption for root-path URLs #107

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
transcendtient wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −1
Open

Fix SFTP path corruption for root-path URLs #107

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
8 changes: 7 additions & 1 deletion ssh2_fopen_wrappers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,15 @@ php_url *php_ssh2_fopen_wrapper_parse_path(const char *path, char *type, php_str
Find resource->path in the original path string, then copy from that
position to the end. This preserves ?query and #fragment (e.g. filenames
containing '#') which php_url_parse() strips from resource->path.
Only search if # or ? is present, since a plain strstr() can otherwise
match resource->path against the "://" scheme separator (e.g. a root
path of "/" matching inside "ssh2.sftp://<id>/").
*/
{
const char *path_in_original = strstr(path, ZSTR_VAL(resource->path));
const char *path_in_original = NULL;
if (strpbrk(path, "#?") != NULL) {
path_in_original = strstr(path, ZSTR_VAL(resource->path));
}
if (path_in_original) {
zend_string_release(resource->path);
resource->path = zend_string_init(path_in_original, strlen(path_in_original), 0);
Expand Down