bug fix for bug #15758, a double free'ing of an ODBC connection

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 6ee3e8f7e268a5e20d790890f8f15d199757eccb..4bf7468e1a9f8db692885001756d6b1f2abb9067 100644 (file)
--- 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;
                                }
                        }