Merge branch 'PHP-8.3'

dstogov · dstogov · commit 8f8b5ba082f8 · 2023-10-23T10:24:15.000+03:00
* PHP-8.3:
  Fix possible NULL dereference (crash on Zend/tests/arginfo_zpp_mismatch.phpt)
diff --git a/ext/zend_test/test.c b/ext/zend_test/test.c
@@ -647,7 +647,11 @@ static ZEND_FUNCTION(zend_test_fill_packed_array)
 static ZEND_FUNCTION(get_open_basedir)
 {
 	ZEND_PARSE_PARAMETERS_NONE();
-	RETURN_STRING(PG(open_basedir));
+	if (PG(open_basedir)) {
+		RETURN_STRING(PG(open_basedir));
+	} else {
+		RETURN_NULL();
+	}
 }
 
 static zend_object *zend_test_class_new(zend_class_entry *class_type)

Original file line number	Diff line number	Diff line change
`@@ -647,7 +647,11 @@ static ZEND_FUNCTION(zend_test_fill_packed_array)`
`647`	`647`	`static ZEND_FUNCTION(get_open_basedir)`
`648`	`648`	`{`
`649`	`649`	`ZEND_PARSE_PARAMETERS_NONE();`
`650`		`- RETURN_STRING(PG(open_basedir));`
	`650`	`+ if (PG(open_basedir)) {`
	`651`	`+ RETURN_STRING(PG(open_basedir));`
	`652`	`+ } else {`
	`653`	`+ RETURN_NULL();`
	`654`	`+ }`
`651`	`655`	`}`
`652`	`656`
`653`	`657`	`static zend_object zend_test_class_new(zend_class_entry class_type)`