Fix for Bug #17572

php · Aug 13, 2002 · 2f1b639 · 2f1b639
1 parent 19e42a2
commit 2f1b639
Showing 1 changed file with 29 additions and 0 deletions.
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
@@ -211,8 +211,23 @@ static void safe_odbc_disconnect( void *handle )
  */
 static void _close_odbc_conn(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 {
+	int i, nument, type;
+	void *ptr;
+	odbc_result *res;
+
 	odbc_connection *conn = (odbc_connection *)rsrc->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);
 	SQLFreeEnv(conn->henv);
@@ -225,7 +240,21 @@ static void _close_odbc_conn(zend_rsrc_list_entry *rsrc TSRMLS_DC)
  */
 static void _close_odbc_pconn(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 {
+	int i, nument, type;
+	void *ptr;
+	odbc_result *res;
 	odbc_connection *conn = (odbc_connection *)rsrc->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);