Skip to content

Commit f8d62b4

Browse files
committed
Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0: Skip oci tests that leak under asan Fix undefined left shift in oci
2 parents 15ee9d2 + 4a8cca2 commit f8d62b4

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

ext/oci8/php_oci8_int.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ extern zend_class_entry *oci_coll_class_entry_ptr;
103103
* PHP_OCI_CRED_EXT must be distinct from the OCI_xxx privilege
104104
* values.
105105
*/
106-
#define PHP_OCI_CRED_EXT (1<<31)
106+
#define PHP_OCI_CRED_EXT (1u<<31)
107107
#if ((PHP_OCI_CRED_EXT == OCI_DEFAULT) || (PHP_OCI_CRED_EXT & (OCI_SYSOPER | OCI_SYSDBA)))
108108
#error Invalid value for PHP_OCI_CRED_EXT
109109
#endif

ext/oci8/tests/privileged_connect1.phpt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
privileged connect tests
33
--EXTENSIONS--
44
oci8
5+
--SKIPIF--
6+
<?php
7+
if (getenv('SKIP_ASAN')) die('skip leaks memory under asan');
8+
?>
59
--INI--
610
oci8.privileged_connect=1
711
--FILE--

ext/pdo_oci/tests/pecl_bug_6364.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ pdo
55
pdo_oci
66
--SKIPIF--
77
<?php
8+
if (getenv('SKIP_ASAN')) die('skip leaks memory under asan');
89
require(__DIR__.'/../../pdo/tests/pdo_test.inc');
910
PDOTest::skip();
1011
?>

0 commit comments

Comments
 (0)