From: Dmitry Stogov <dmitry@php.net>
Date: Fri, 23 Dec 2005 09:41:31 +0000 (+0000)
Subject: Fixed memory corruption and termination through _zend_bailout()
X-Git-Tag: RELEASE_1_0_4~258
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b863d322884e4f0789eb136c22d66780b3244bb8;p=php

Fixed memory corruption and termination through _zend_bailout()
---

diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index 34eb360488..2e8447cfc0 100755
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -1313,6 +1313,8 @@ void pdo_dbh_init(TSRMLS_D)
 
 static void dbh_free(pdo_dbh_t *dbh TSRMLS_DC)
 {
+	int i;
+
 	if (--dbh->refcount)
 		return;
 
@@ -1333,6 +1335,13 @@ static void dbh_free(pdo_dbh_t *dbh TSRMLS_DC)
 	if (dbh->def_stmt_ctor_args) {
 		zval_ptr_dtor(&dbh->def_stmt_ctor_args);
 	}
+	
+	for (i = 0; i < PDO_DBH_DRIVER_METHOD_KIND__MAX; i++) {
+		if (dbh->cls_methods[i]) {
+			zend_hash_destroy(dbh->cls_methods[i]);
+			pefree(dbh->cls_methods[i], dbh->is_persistent);
+		}
+	}
 
 	pefree(dbh, dbh->is_persistent);
 }
@@ -1349,9 +1358,6 @@ static void pdo_dbh_free_storage(pdo_dbh_t *dbh TSRMLS_DC)
 		efree(dbh->properties);
 		dbh->properties = NULL;
 	}
-	if (dbh->cls_methods) {
-		zend_hash_destroy(&dbh->cls_methods);
-	}
 
 	if (!dbh->is_persistent) {
 		dbh_free(dbh TSRMLS_CC);