wez Fri Jul 8 11:25:16 2005 EDT
Modified files:
/php-src/ext/pdo pdo_stmt.c
Log:
Fix a shutdown order issue I saw in the pgsql driver. Hope this doesn't mess
up something in the OCI driver; I think I've been here before.
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_stmt.c?r1=1.105&r2=1.106&ty=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.105 php-src/ext/pdo/pdo_stmt.c:1.106
--- php-src/ext/pdo/pdo_stmt.c:1.105 Fri Jul 8 00:12:58 2005
+++ php-src/ext/pdo/pdo_stmt.c Fri Jul 8 11:25:15 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_stmt.c,v 1.105 2005/07/08 04:12:58 wez Exp $ */
+/* $Id: pdo_stmt.c,v 1.106 2005/07/08 15:25:15 wez Exp $ */
/* The PDO Statement Handle Class */
@@ -1838,6 +1838,19 @@
stmt->properties = NULL;
}
+ if (stmt->bound_params) {
+ zend_hash_destroy(stmt->bound_params);
+ FREE_HASHTABLE(stmt->bound_params);
+ }
+ if (stmt->bound_param_map) {
+ zend_hash_destroy(stmt->bound_param_map);
+ FREE_HASHTABLE(stmt->bound_param_map);
+ }
+ if (stmt->bound_columns) {
+ zend_hash_destroy(stmt->bound_columns);
+ FREE_HASHTABLE(stmt->bound_columns);
+ }
+
if (stmt->methods && stmt->methods->dtor) {
stmt->methods->dtor(stmt TSRMLS_CC);
}
@@ -1855,18 +1868,6 @@
efree(stmt->columns);
}
- if (stmt->bound_params) {
- zend_hash_destroy(stmt->bound_params);
- FREE_HASHTABLE(stmt->bound_params);
- }
- if (stmt->bound_param_map) {
- zend_hash_destroy(stmt->bound_param_map);
- FREE_HASHTABLE(stmt->bound_param_map);
- }
- if (stmt->bound_columns) {
- zend_hash_destroy(stmt->bound_columns);
- FREE_HASHTABLE(stmt->bound_columns);
- }
do_fetch_opt_finish(stmt, 1 TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
