com php-src: rewrite the getcwd part: Zend/zend_virtual_cwd .c
| From: | Anatol Belski | Date: | Thu, 01 Sep 2016 21:45:31 +0000 |
| Subject: | com php-src: rewrite the getcwd part: Zend/zend_virtual_cwd .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-94233@lists.php.net to get a copy of this message | ||
Commit: ac82a3418507b7f292783c7281cadf3388b9db0b
Author: Anatol Belski <ab@php.net> Thu, 1 Sep 2016 21:31:40 +0200
Parents: 7020e6f9ae6d12e841e09aa582d843ffa5478e08
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ac82a3418507b7f292783c7281cadf3388b9db0b
Log:
rewrite the getcwd part
Also fixes a possible memory leak. Still not ideal, as seems CWD
longer than MAX_PATH is still not supported. But a heap allocation
is not needed anyway, as MAXPATHLEN value is the maximum supported.
Changed paths:
M Zend/zend_virtual_cwd.c
Diff:
diff --git a/Zend/zend_virtual_cwd.c b/Zend/zend_virtual_cwd.c
index ce5f1ff..be2dd0d 100644
--- a/Zend/zend_virtual_cwd.c
+++ b/Zend/zend_virtual_cwd.c
@@ -328,32 +328,19 @@ CWD_API int php_sys_stat_ex(const char *path, zend_stat_t *buf, int lstat) /*
{{
buf->st_dev = buf->st_rdev = 0;
} else {
wchar_t cur_path[MAXPATHLEN+1];
- DWORD len = sizeof(cur_path);
- wchar_t *tmp = cur_path;
-
- while(1) {
- DWORD r = GetCurrentDirectoryW(len, tmp);
- if (r < len) {
- if (tmp[1] == L':') {
- if (pathw[0] >= L'A' && pathw[0] <= L'Z') {
- buf->st_dev = buf->st_rdev = pathw[0] - L'A';
- } else {
- buf->st_dev = buf->st_rdev = pathw[0] - L'a';
- }
+
+ if (NULL != _wgetcwd(cur_path, sizeof(cur_path)/sizeof(wchar_t))) {
+ if (cur_path[1] == L':') {
+ if (pathw[0] >= L'A' && pathw[0] <= L'Z') {
+ buf->st_dev = buf->st_rdev = pathw[0] - L'A';
} else {
- buf->st_dev = buf->st_rdev = -1;
+ buf->st_dev = buf->st_rdev = pathw[0] - L'a';
}
- break;
- } else if (!r) {
- buf->st_dev = buf->st_rdev = -1;
- break;
} else {
- len = r+1;
- tmp = (wchar_t*)malloc(len*sizeof(wchar_t));
+ buf->st_dev = buf->st_rdev = -1;
}
- }
- if (tmp != cur_path) {
- free(tmp);
+ } else {
+ buf->st_dev = buf->st_rdev = -1;
}
}