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 6ce5c96d4356f92d8292aae818afdcf56ddcedfa..e6da65788277436cd45ca61671b02edb8d2a3e14 100644 (file)
--- 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 {