cvs: php4 /ext/odbc php_odbc.c

kalowsky Fri Apr 26 10:56:34 2002 EDT Modified files: /php4/ext/odbc php_odbc.c Log: bug fix for bug #15758, a double free'ing of an ODBC connection Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.124 php4/ext/odbc/php_odbc.c:1.125 --- php4/ext/odbc/php_odbc.c:1.124 Wed Apr 24 18:07:29 2002 +++ php4/ext/odbc/php_odbc.c Fri Apr 26 10:56:34 2002 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.124 2002/04/24 22:07:29 kalowsky Exp $ */ +/* $Id: php_odbc.c,v 1.125 2002/04/26 14:56:34 kalowsky Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -2152,8 +2152,13 @@ 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; } }