com php-src: reverted too much: main/fopen_wrappers.c
| From: | Anatol Belski | Date: | Fri, 19 Sep 2014 14:30:06 +0000 |
| Subject: | com php-src: reverted too much: main/fopen_wrappers.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81779@lists.php.net to get a copy of this message | ||
Commit: d4c5271c0c87c8b0b1a5f8f9c7a43917e2a58039
Author: Anatol Belski <ab@php.net> Fri, 19 Sep 2014 16:26:32 +0200
Parents: d1131d4278ce645d359aa74ee549183beff545a4
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d4c5271c0c87c8b0b1a5f8f9c7a43917e2a58039
Log:
reverted too much
Changed paths:
M main/fopen_wrappers.c
Diff:
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index 7afa04c..a4aa10f 100644
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -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;