MFH: fix #36055 (possible OCI8 crash in multithreaded environment)

diff --git a/NEWS b/NEWS
index dc0c7b9561bdbd7b3fec76767664bea58b78de0c..60d5b82d2dd4b5ce7474daacedadbdc80014fbc0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ PHP                                                                        NEWS
   MYSQLI_TYPE_NEWDECIMAL and MYSQLI_TYPE_BIT. FR #36007. (Georg)
 - Fixed imagecolorallocate() and imagecolorallocatelapha() to return FALSE
   on error. (Pierre)
+- Fixed bug #36055 (possible OCI8 crash in multithreaded environment). (Tony)
 - Fixed bug #36046 (parse_ini_file() miscounts lines in multi-line values).
   (Ilia)
 - Fixed bug #36038 (ext/hash compile failure on Mac OSX). (Tony)

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index b8257b6fda7b7c860077b9e4e0d72d1e2b66dc41..e00861bedf2c877e51d2a0d5f56bbdc15e7ac2d8 100644 (file)
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -89,6 +89,7 @@ static void php_oci_collection_list_dtor (zend_rsrc_list_entry * TSRMLS_DC);
 
 static int php_oci_persistent_helper(zend_rsrc_list_entry *le TSRMLS_DC);
 #ifdef ZTS
+static int php_oci_statement_helper(zend_rsrc_list_entry *le TSRMLS_DC);
 static int php_oci_regular_helper(zend_rsrc_list_entry *le TSRMLS_DC);
 #endif
 static int php_oci_connection_ping(php_oci_connection * TSRMLS_DC);
@@ -622,6 +623,10 @@ PHP_MSHUTDOWN_FUNCTION(oci)
 
 PHP_RSHUTDOWN_FUNCTION(oci)
 {
+#ifdef ZTS
+       zend_hash_apply(&EG(regular_list), (apply_func_t) php_oci_statement_helper TSRMLS_CC);
+#endif
+
        /* check persistent connections and do the necessary actions if needed */
        zend_hash_apply(&EG(persistent_list), (apply_func_t) php_oci_persistent_helper TSRMLS_CC);
 
@@ -1745,6 +1750,21 @@ static int php_oci_regular_helper(zend_rsrc_list_entry *le TSRMLS_DC)
        }
        return 0;
 } /* }}} */
+
+/* {{{ php_oci_statement_helper() 
+ Helper function to destroy statements on thread shutdown in ZTS mode */
+static int php_oci_statement_helper(zend_rsrc_list_entry *le TSRMLS_DC)
+{
+       php_oci_statement *statement;
+
+       if (le->type == le_statement) {
+               statement = (php_oci_statement *)le->ptr;
+               if (statement) {
+                       return 1;
+               }
+       }
+       return 0;
+} /* }}} */
 #endif
 
 #endif /* HAVE_OCI8 */