archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.0' into PHP-8.1

Browse source 
* PHP-8.0:
  Skip oci tests that leak under asan
  Fix undefined left shift in oci
This commit is contained in:
Ilija Tovilo 2022-09-08 15:57:53 +02:00
commit f8d62b4c4b
No known key found for this signature in database
GPG key ID: A4F5D403F118200A
3 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/oci8/php_oci8_int.h
View file

@ -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 * PHP_OCI_CRED_EXT must be distinct from the OCI_xxx privilege
* values. * 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))) #if ((PHP_OCI_CRED_EXT == OCI_DEFAULT) || (PHP_OCI_CRED_EXT & (OCI_SYSOPER | OCI_SYSDBA)))
#error Invalid value for PHP_OCI_CRED_EXT #error Invalid value for PHP_OCI_CRED_EXT
#endif #endif

4
ext/oci8/tests/privileged_connect1.phpt
View file

@ -2,6 +2,10 @@
privileged connect tests privileged connect tests
--EXTENSIONS-- --EXTENSIONS--
oci8 oci8
--SKIPIF--
<?php
if (getenv('SKIP_ASAN')) die('skip leaks memory under asan');
?>
--INI-- --INI--
oci8.privileged_connect=1 oci8.privileged_connect=1
--FILE-- --FILE--

1
ext/pdo_oci/tests/pecl_bug_6364.phpt
View file

@ -5,6 +5,7 @@ pdo
pdo_oci pdo_oci
--SKIPIF-- --SKIPIF--
<?php <?php
if (getenv('SKIP_ASAN')) die('skip leaks memory under asan');
require(__DIR__.'/../../pdo/tests/pdo_test.inc'); require(__DIR__.'/../../pdo/tests/pdo_test.inc');
PDOTest::skip(); PDOTest::skip();
?> ?>