summaryrefslogtreecommitdiff
path: root/ext/odbc/php_odbc.c
diff options
context:
space:
mode:
authorDan Kalowsky <kalowsky@php.net>2002-04-26 14:56:34 +0000
committerDan Kalowsky <kalowsky@php.net>2002-04-26 14:56:34 +0000
commitce39ba7265862bacb1da32d870dafb6b009dfb30 (patch)
tree9d2df0d80f80fe6243a23c415d94098626696501 /ext/odbc/php_odbc.c
parente2ad07fdcf61a5b9967f8aa05b7df69810faff7a (diff)
downloadphp-git-ce39ba7265862bacb1da32d870dafb6b009dfb30.tar.gz
bug fix for bug #15758, a double free'ing of an ODBC connection
Diffstat (limited to 'ext/odbc/php_odbc.c')
-rw-r--r--ext/odbc/php_odbc.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 6ee3e8f7e2..4bf7468e1a 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -2152,8 +2152,13 @@ try_and_get_another_connection:
if(ret != SQL_SUCCESS || len == 0) {
zend_hash_del(&EG(persistent_list), hashed_details, hashed_len + 1);
- safe_odbc_disconnect(db_conn->hdbc);
- SQLFreeConnect(db_conn->hdbc);
+ /* Commented out to fix a possible double closure error
+ * when working with persistent connections as submitted by
+ * bug #15758
+ *
+ * safe_odbc_disconnect(db_conn->hdbc);
+ * SQLFreeConnect(db_conn->hdbc);
+ */
goto try_and_get_another_connection;
}
}