mirror of
https://github.com/php/php-src.git
synced 2025-08-15 21:48:51 +02:00
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
This commit is contained in:
commit
f8d62b4c4b
3 changed files with 6 additions and 1 deletions
|
@ -103,7 +103,7 @@ extern zend_class_entry *oci_coll_class_entry_ptr;
|
|||
* PHP_OCI_CRED_EXT must be distinct from the OCI_xxx privilege
|
||||
* values.
|
||||
*/
|
||||
#define PHP_OCI_CRED_EXT (1<<31)
|
||||
#define PHP_OCI_CRED_EXT (1u<<31)
|
||||
#if ((PHP_OCI_CRED_EXT == OCI_DEFAULT) || (PHP_OCI_CRED_EXT & (OCI_SYSOPER | OCI_SYSDBA)))
|
||||
#error Invalid value for PHP_OCI_CRED_EXT
|
||||
#endif
|
||||
|
|
|
@ -2,6 +2,10 @@
|
|||
privileged connect tests
|
||||
--EXTENSIONS--
|
||||
oci8
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (getenv('SKIP_ASAN')) die('skip leaks memory under asan');
|
||||
?>
|
||||
--INI--
|
||||
oci8.privileged_connect=1
|
||||
--FILE--
|
||||
|
|
|
@ -5,6 +5,7 @@ pdo
|
|||
pdo_oci
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (getenv('SKIP_ASAN')) die('skip leaks memory under asan');
|
||||
require(__DIR__.'/../../pdo/tests/pdo_test.inc');
|
||||
PDOTest::skip();
|
||||
?>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue