cvs: php4(PHP_4_2_0) /ext/odbc php_odbc.c

From: Date: Sat, 17 Aug 2002 16:20:11 +0000
Subject: cvs: php4(PHP_4_2_0) /ext/odbc php_odbc.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-13438@lists.php.net to get a copy of this message
kalowsky Sat Aug 17 12:20:11 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4/ext/odbc php_odbc.c Log: MFH, fixing close crash case on Windows Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.120.2.2 php4/ext/odbc/php_odbc.c:1.120.2.3 --- php4/ext/odbc/php_odbc.c:1.120.2.2 Tue Apr 30 09:16:01 2002 +++ php4/ext/odbc/php_odbc.c Sat Aug 17 12:20:10 2002 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.120.2.2 2002/04/30 13:16:01 kalowsky Exp $ */ +/* $Id: php_odbc.c,v 1.120.2.3 2002/08/17 16:20:10 kalowsky Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -211,6 +211,19 @@ static void _close_odbc_conn(zend_rsrc_list_entry *rsrc TSRMLS_DC) { odbc_connection *conn = (odbc_connection *)rsrc->ptr; + int i, nument, type; + void *ptr; + + nument = zend_hash_next_free_element(&EG(regular_list)); + for(i = 1; i < nument; i++) { + ptr = zend_list_find(i, &type); + if (ptr && (type == le_result)) { + res = (odbc_result *)ptr; + if (res->conn_ptr == conn) { + zend_list_delete(i); + } + } + } safe_odbc_disconnect(conn->hdbc); SQLFreeConnect(conn->hdbc); @@ -223,6 +236,19 @@ static void _close_odbc_pconn(zend_rsrc_list_entry *rsrc TSRMLS_DC) { odbc_connection *conn = (odbc_connection *)rsrc->ptr; + int i, nument, type; + void *ptr; + + nument = zend_hash_next_free_element(&EG(regular_list)); + for(i = 1; i < nument; i++) { + ptr = zend_list_find(i, &type); + if (ptr && (type == le_result)) { + res = (odbc_result *)ptr; + if (res->conn_ptr == conn) { + zend_list_delete(i); + } + } + } safe_odbc_disconnect(conn->hdbc); SQLFreeConnect(conn->hdbc);

« previous php.cvs (#13438) next »