From: Ilia Alshanetsky Date: Wed, 19 Feb 2003 00:49:31 +0000 (+0000) Subject: Fixed bug #22283 (possible crash when opening relative URLs). X-Git-Tag: RELEASE_0_5~887 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6ef609a371e6dfeb4ca89c576f8c4037e4bf754;p=php Fixed bug #22283 (possible crash when opening relative URLs). --- diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c index 6ce5c96d43..e6da657882 100644 --- a/ext/standard/http_fopen_wrapper.c +++ b/ext/standard/http_fopen_wrapper.c @@ -348,8 +348,13 @@ php_stream *php_stream_url_wrap_http(php_stream_wrapper *wrapper, char *path, ch *new_path='\0'; if (strlen(location)<8 || (strncasecmp(location, "http://", sizeof("http://")-1) && strncasecmp(location, "https://", sizeof("https://")-1))) { if (*location != '/') { - if (*(location+1) != '\0') { - php_dirname(resource->path, strlen(resource->path)); + if (*(location+1) != '\0' && resource->path) { + char *s = strrchr(resource->path, '/'); + if (!s) { + s = resource->path; + *s = '/'; + } + s[1] = '\0'; if (resource->path && *(resource->path) == '/' && *(resource->path + 1) == '\0') { snprintf(loc_path, sizeof(loc_path) - 1, "%s%s", resource->path, location); } else {