]> granicus.if.org Git - php/commitdiff
reverted too much
authorAnatol Belski <ab@php.net>
Fri, 19 Sep 2014 14:26:32 +0000 (16:26 +0200)
committerAnatol Belski <ab@php.net>
Fri, 19 Sep 2014 14:30:06 +0000 (16:30 +0200)
main/fopen_wrappers.c

index 7afa04c7d5abaee5e4abb4d67e03f848b0f9058f..a4aa10fce87b1e1c256acb4cffa215cc51e6aaad 100644 (file)
@@ -759,11 +759,15 @@ PHPAPI char *expand_filepath_with_mode(const char *filepath, char *real_path, co
        cwd_state new_state;
        char cwd[MAXPATHLEN];
        int copy_len;
-       int path_len = (int)strlen(filepath);
+       int path_len;
 
        if (!filepath[0]) {
                return NULL;
-       } else if (IS_ABSOLUTE_PATH(filepath, path_len)) {
+       }
+
+       path_len = (int)strlen(filepath);
+
+       if (IS_ABSOLUTE_PATH(filepath, path_len)) {
                cwd[0] = '\0';
        } else {
                const char *iam = SG(request_info).path_translated;