com php-src: Merge branch 'PHP-7.1' into PHP-7.2: Zend/zend.c Zend/zend_virtual_cwd.c Zend/zend_virtual_cwd.h main/main.c

Commit: 0a2a136111a410c58c4cab10c69eafafcf827fa0 Author: Anatol Belski <ab@php.net> Mon, 14 Aug 2017 00:51:47 +0200 Parents: 36eddfc785ad2db4293571eabb5fc5ac989bb8d8 3069ad8dd1400f19a28230d3028048a27d07ce8d Branches: PHP-7.2 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0a2a136111a410c58c4cab10c69eafafcf827fa0 Log: Merge branch 'PHP-7.1' into PHP-7.2 * PHP-7.1: Fixed bug #75063 Bugs: https://bugs.php.net/75063 Changed paths: MM Zend/zend.c MM Zend/zend_virtual_cwd.c MM Zend/zend_virtual_cwd.h MM main/main.c Diff: diff --cc Zend/zend_virtual_cwd.c index e9ffda7,2fa12f8..3e95795 --- a/Zend/zend_virtual_cwd.c +++ b/Zend/zend_virtual_cwd.c @@@ -394,12 -450,27 +394,17 @@@ void virtual_cwd_main_cwd_init(uint8_t char cwd[MAXPATHLEN]; char *result; + if (reinit) { + free(main_cwd_state.cwd); + } -#ifdef NETWARE - result = getcwdpath(cwd, NULL, 1); - if(result) - { - char *c=cwd; - while(c = strchr(c, '\\')) - { - *c='/'; - ++c; - } - } -#elif defined(ZEND_WIN32) +#ifdef ZEND_WIN32 ZeroMemory(&cwd, sizeof(cwd)); - #endif + result = php_win32_ioutil_getcwd(cwd, sizeof(cwd)); + #else result = getcwd(cwd, sizeof(cwd)); + #endif + if (!result) { cwd[0] = '\0'; }