wip

Author: iluuu1994

Zend/tests/gh10469.phpt

@@ -1,5 +1,7 @@
 --TEST--
 GH-10469: Disallow open_basedir() with parent dir components (..)
+--EXTENSIONS--
+zend_test
 --FILE--
 <?php
 ini_set('open_basedir', __DIR__);
@@ -11,13 +13,16 @@ 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');
 
 chdir($originalDir);
 var_dump(ini_get('open_basedir'));
+var_dump(get_open_basedir());
 ?>
 --CLEAN--
 <?php
 @rmdir(__DIR__ . '/gh10469_tmp');
 ?>
 --EXPECTF--
 string(%d) "%stests:.%e..:.%e..%e"
+string(%d) "%stests:%stests:%stests%e:%stests%egh10469_tmp%ea"

ext/zend_test/test.c

@@ -533,6 +533,12 @@ static ZEND_FUNCTION(zend_get_map_ptr_last)
 	RETURN_LONG(CG(map_ptr_last));
 }
 
+static ZEND_FUNCTION(get_open_basedir)
+{
+	ZEND_PARSE_PARAMETERS_NONE();
+	RETURN_STRING(PG(open_basedir));
+}
+
 static zend_object *zend_test_class_new(zend_class_entry *class_type)
 {
 	zend_object *obj = zend_objects_new(class_type);

ext/zend_test/test.stub.php

@@ -192,6 +192,8 @@ function zend_test_zend_call_stack_use_all(): int {}
     function zend_test_is_string_marked_as_valid_utf8(string $string): bool {}
 
     function zend_get_map_ptr_last(): int {}
+
+    function get_open_basedir(): ?string {}
 }
 
 namespace ZendTestNS {

ext/zend_test/test_arginfo.h

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