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

Fixed valgrind issue

Browse source
This commit is contained in:
Tianfang Yang 2017-10-16 19:16:30 -04:00
parent 7778106f40
commit aad4544e95
4 changed files with 33 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -19,6 +19,9 @@ PHP NEWS
. Fixed bug #75301 (Exif extension has built in revision version). (Peter . Fixed bug #75301 (Exif extension has built in revision version). (Peter
Kokot) Kokot)
- OCI8:
. Fixed valgrind issue. (Tianfang Yang)
- OpenSSL: - OpenSSL:
. Fixed bug #75363 (openssl_x509_parse leaks memory). (Bob, Jakub Zelenka) . Fixed bug #75363 (openssl_x509_parse leaks memory). (Bob, Jakub Zelenka)

15
ext/oci8/oci8_interface.c
View file

@ -1611,14 +1611,15 @@ PHP_FUNCTION(oci_close)
} }
PHP_OCI_ZVAL_TO_CONNECTION(z_connection, connection); PHP_OCI_ZVAL_TO_CONNECTION(z_connection, connection);
if (GC_REFCOUNT(connection->id) == 2) /* CHANGED VERSION::PHP7 if (GC_REFCOUNT(connection->id) == 2) { /* CHANGED VERSION::PHP7
Changed the refCount to 2 since Changed the refCount to 2 since
internally Zend engine increments internally Zend engine increments
RefCount value by 1 */ RefCount value by 1 */
/* Unregister Oracle TAF */
php_oci_unregister_taf_callback(connection);
zend_list_close(connection->id); zend_list_close(connection->id);
}
/* Unregister Oracle TAF */
php_oci_unregister_taf_callback(connection);
/* ZVAL_NULL(z_connection); */ /* ZVAL_NULL(z_connection); */

22
ext/oci8/package.xml
View file

@ -56,8 +56,8 @@ Interoperability Support" (ID 207303.1) for details.
<time>12:00:00</time> <time>12:00:00</time>
<version> <version>
<release>2.1.7</release> <release>2.1.8</release>
<api>2.1.7</api> <api>2.1.8</api>
</version> </version>
<stability> <stability>
<release>stable</release> <release>stable</release>
@ -66,7 +66,7 @@ Interoperability Support" (ID 207303.1) for details.
<license uri="http://www.php.net/license">PHP</license> <license uri="http://www.php.net/license">PHP</license>
<notes> <notes>
This version is for PHP 7 only. This version is for PHP 7 only.
Added oci_unregister_taf_callback() Fixed reference counting and memory issues. (Dmitry, Tianfang)
</notes> </notes>
<contents> <contents>
<dir name="/"> <dir name="/">
@ -476,6 +476,22 @@ Added oci_unregister_taf_callback()
</extsrcrelease> </extsrcrelease>
<changelog> <changelog>
<release>
<version>
<release>2.1.7</release>
<api>2.1.7</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.php.net/license">PHP</license>
<notes>
This version is for PHP 7 only.
Added oci_unregister_taf_callback()
</notes>
</release>
<release> <release>
<version> <version>
<release>2.1.6</release> <release>2.1.6</release>

6
ext/oci8/tests/driver_name.phpt
View file

@ -57,11 +57,11 @@ function get_attr($conn)
?> ?>
--EXPECT-- --EXPECT--
**Test 1.1 - Default values for the attribute ************** **Test 1.1 - Default values for the attribute **************
The value of DRIVER_NAME is PHP OCI8 : 2.1.7 The value of DRIVER_NAME is PHP OCI8 : 2.1.8
***Test 1.2 - Get the values from different connections ************** ***Test 1.2 - Get the values from different connections **************
Testing with oci_pconnect() Testing with oci_pconnect()
The value of DRIVER_NAME is PHP OCI8 : 2.1.7 The value of DRIVER_NAME is PHP OCI8 : 2.1.8
Testing with oci_new_connect() Testing with oci_new_connect()
The value of DRIVER_NAME is PHP OCI8 : 2.1.7 The value of DRIVER_NAME is PHP OCI8 : 2.1.8
Done Done