Skip to content

Commit 10c8103

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Skip dl() tests on ASAN
2 parents d229a48 + fb0f421 commit 10c8103

File tree

6 files changed

+15
-0
lines changed

6 files changed

+15
-0
lines changed

ext/dl_test/tests/skip.inc

+4
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,7 @@ if (PHP_OS_FAMILY === 'Windows') {
1212
if (!file_exists($path)) {
1313
die(sprintf('skip dl_test extension is not built (tried %s)', $path));
1414
}
15+
16+
if (getenv('SKIP_ASAN')) {
17+
die('xleak dl() crashes LSan');
18+
}

ext/opcache/tests/bug68104.phpt

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ opcache.enable_cli=1
88
disable_functions=dl
99
--EXTENSIONS--
1010
opcache
11+
--SKIPIF--
12+
<?php
13+
if (getenv('SKIP_ASAN')) die('xleak dl() crashes LSan');
14+
?>
1115
--FILE--
1216
<?php
1317
var_dump(is_callable("dl"));

ext/standard/tests/general_functions/dl-check-enabled.phpt

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ $enabled_sapi = array('cgi-fcgi', 'cli', 'embed', 'fpm');
99
if (!in_array(php_sapi_name(), $enabled_sapi)) {
1010
die('skip dl() is not enabled for ' . php_sapi_name());
1111
}
12+
if (getenv('SKIP_ASAN')) die('xleak dl() crashes LSan');
1213
?>
1314
--INI--
1415
enable_dl=0

ext/standard/tests/general_functions/dl-cve-2007-4887.phpt

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ $enabled_sapi = array('cgi-fcgi', 'cli', 'embed', 'fpm');
66
if (!in_array(php_sapi_name(), $enabled_sapi)) {
77
die('skip dl() is not enabled for ' . php_sapi_name());
88
}
9+
if (getenv('SKIP_ASAN')) die('xleak dl() crashes LSan');
910
?>
1011
--INI--
1112
enable_dl=1

ext/standard/tests/general_functions/dl-full-path-not-supported.phpt

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ $enabled_sapi = array('cgi-fcgi', 'cli', 'embed', 'fpm');
99
if (!in_array(php_sapi_name(), $enabled_sapi)) {
1010
die('skip dl() is not enabled for ' . php_sapi_name());
1111
}
12+
if (getenv('SKIP_ASAN')) die('xleak dl() crashes LSan');
1213
?>
1314
--INI--
1415
enable_dl=1

ext/standard/tests/general_functions/gh9589.phpt

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
dl() segfaults when module is already loaded
33
--EXTENSIONS--
44
dl_test
5+
--SKIPIF--
6+
<?php
7+
if (getenv('SKIP_ASAN')) die('xleak dl() crashes LSan');
8+
?>
59
--FILE--
610
<?php
711
dl("dl_test");

0 commit comments

Comments
 (0)