From: Anatol Belski <ab@php.net>
Date: Sun, 13 Aug 2017 22:51:47 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0beta3~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a2a136111a410c58c4cab10c69eafafcf827fa0;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #75063
---

0a2a136111a410c58c4cab10c69eafafcf827fa0
diff --cc Zend/zend_virtual_cwd.c
index e9ffda7cc3,2fa12f8180..3e95795b08
--- 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';
  	}