tony2001                Fri Feb  3 14:46:43 2006 UTC

  Modified files:              (Branch: PHP_5_1)
    /php-src/ext/oci8   oci8_statement.c 
    /php-src    NEWS 
  Log:
  fix #36010 (Segfault when re-creating and re-executing statements with bound 
parameters)
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/oci8_statement.c?r1=1.7.2.10&r2=1.7.2.11&diff_format=u
Index: php-src/ext/oci8/oci8_statement.c
diff -u php-src/ext/oci8/oci8_statement.c:1.7.2.10 
php-src/ext/oci8/oci8_statement.c:1.7.2.11
--- php-src/ext/oci8/oci8_statement.c:1.7.2.10  Tue Jan 31 18:38:52 2006
+++ php-src/ext/oci8/oci8_statement.c   Fri Feb  3 14:46:42 2006
@@ -25,7 +25,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: oci8_statement.c,v 1.7.2.10 2006/01/31 18:38:52 tony2001 Exp $ */
+/* $Id: oci8_statement.c,v 1.7.2.11 2006/02/03 14:46:42 tony2001 Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
@@ -70,7 +70,7 @@
                        php_oci_error(connection->err, connection->errcode 
TSRMLS_CC);
 
 #if HAVE_OCI_STMT_PREPARE2
-                       PHP_OCI_CALL(OCIStmtRelease, (statement->stmt, 
statement->err, NULL, 0, OCI_DEFAULT));
+                       PHP_OCI_CALL(OCIStmtRelease, (statement->stmt, 
statement->err, NULL, 0, OCI_STRLS_CACHE_DELETE));
                        PHP_OCI_CALL(OCIHandleFree,(statement->err, 
OCI_HTYPE_ERROR));
 #else
                        PHP_OCI_CALL(OCIHandleFree,(statement->stmt, 
OCI_HTYPE_STMT));
@@ -578,7 +578,7 @@
        if (statement->stmt) {
 #if HAVE_OCI_STMT_PREPARE2
                if (statement->last_query_len) { /* FIXME: magical */
-                       PHP_OCI_CALL(OCIStmtRelease, (statement->stmt, 
statement->err, NULL, 0, OCI_DEFAULT));
+                       PHP_OCI_CALL(OCIStmtRelease, (statement->stmt, 
statement->err, NULL, 0, OCI_STRLS_CACHE_DELETE));
                }
                else {
                        PHP_OCI_CALL(OCIHandleFree, (statement->stmt, 
OCI_HTYPE_STMT));
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.395&r2=1.2027.2.396&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.395 php-src/NEWS:1.2027.2.396
--- php-src/NEWS:1.2027.2.395   Fri Feb  3 09:31:59 2006
+++ php-src/NEWS        Fri Feb  3 14:46:42 2006
@@ -51,6 +51,8 @@
 - Fixed bug #36016 (realpath cache memleaks). (Dmitry, Nuno)
 - Fixed bug #36011 (Strict errormsg wrong for call_user_func() and the likes).
   (Marcus)
+- Fixed bug #36010 (Segfault when re-creating and re-executing statements with 
+  bound parameters). (Tony)
 - Fixed bug #36006 (Problem with $this in __destruct()). (Dmitry)
 - Fixed bug #35999 (recursive mkdir() does not work with relative path
   like "foo/bar"). (Tony)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to