Fix Windows

Author: iluuu1994

Zend/tests/gh10469.phpt

@@ -6,14 +6,15 @@ zend_test
 <?php
 ini_set('open_basedir', __DIR__);
 
+$pathSeparator = PHP_OS_FAMILY !== 'Windows' ? ':' : ';';
 $originalDir = __DIR__;
 $tmpDir = $originalDir . '/gh10469_tmp';
 @mkdir($tmpDir, 0777, true);
 chdir($tmpDir);
-ini_set('open_basedir', ini_get('open_basedir') . ':.' . DIRECTORY_SEPARATOR . '..');
-ini_set('open_basedir', ini_get('open_basedir') . ':.' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR);
-ini_set('open_basedir', ini_get('open_basedir') . ':' . DIRECTORY_SEPARATOR . 'a' . DIRECTORY_SEPARATOR);
-ini_set('open_basedir', ini_get('open_basedir') . ':.' . DIRECTORY_SEPARATOR . 'a');
+ini_set('open_basedir', ini_get('open_basedir') . $pathSeparator . '.' . DIRECTORY_SEPARATOR . '..');
+ini_set('open_basedir', ini_get('open_basedir') . $pathSeparator . '.' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR);
+ini_set('open_basedir', ini_get('open_basedir') . $pathSeparator . '.' . DIRECTORY_SEPARATOR . 'a' . DIRECTORY_SEPARATOR);
+ini_set('open_basedir', ini_get('open_basedir') . $pathSeparator . '.' . DIRECTORY_SEPARATOR . 'a');
 
 chdir($originalDir);
 var_dump(ini_get('open_basedir'));
@@ -24,5 +25,5 @@ var_dump(get_open_basedir());
 @rmdir(__DIR__ . '/gh10469_tmp');
 ?>
 --EXPECTF--
-string(%d) "%stests:.%e..:.%e..%e"
-string(%d) "%stests:%stests:%stests%e:%stests%egh10469_tmp%ea"
+string(%d) "%stests%c.%e..%c.%e..%e%c.%ea%e%c.%ea"
+string(%d) "%stests%c%stests%c%stests%e%c%stests%egh10469_tmp%ea"

main/fopen_wrappers.c

@@ -98,7 +98,7 @@ PHPAPI ZEND_INI_MH(OnUpdateBaseDir)
 		}
 		char resolved_name[MAXPATHLEN + 1];
 		if (expand_filepath(ptr, resolved_name) == NULL) {
-			// efree(pathbuf);
+			efree(pathbuf);
 			smart_str_free(&buf);
 			return FAILURE;
 		}