From 284bc523d657b066aee5b309be17a4fbb1c57c31 Mon Sep 17 00:00:00 2001
From: "Thies C. Arntzen" <thies@php.net>
Date: Wed, 29 Sep 1999 14:20:27 +0000
Subject: [PATCH] fixed crash in connection shutdown!

---
 ChangeLog            |  1 +
 ext/oci8/oci8.c      | 37 ++++++++++++++++++++++++++++---------
 ext/oci8/php3_oci8.h |  2 ++
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 972b981273..048fd9c916 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ PHP 4.0 CHANGE LOG                                                    ChangeLog
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
 ?? ?? 1999, Version 4.0 Beta 3
+- Fixed LOB/Persistent-Connection related OCI8-Crash (Thies)
 - Generalized server-API build procedure on UNIX (Stig)
 - Added '--disable-rpath' option (Sascha)
 - Added AOLserver SAPI module (Sascha)
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index da16cb555c..6968c549cb 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -296,6 +296,9 @@ static void php_oci_init_globals(php_oci_globals *oci_globals)
 	OCI(server) = malloc(sizeof(HashTable));
 	zend_hash_init(OCI(server), 13, NULL, NULL, 1); 
 
+	OCI(conns) = malloc(sizeof(HashTable));
+	zend_hash_init(OCI(conns), 13, NULL, NULL, 1);
+
 	OCIEnvInit(&OCI(pEnv), OCI_DEFAULT, 0, NULL);
 	OCIHandleAlloc(OCI(pEnv), 
 				   (dvoid **)&OCI(pError),
@@ -323,6 +326,9 @@ PHP_MINIT_FUNCTION(oci)
 	OCI(server) = malloc(sizeof(HashTable));
 	zend_hash_init(OCI(server), 13, NULL, NULL, 1); 
 
+	OCI(conns) = malloc(sizeof(HashTable));
+	zend_hash_init(OCI(conns), 13, NULL, NULL, 1);
+
 	OCIEnvInit(&OCI(pEnv), OCI_DEFAULT, 0, NULL);
 	OCIHandleAlloc(OCI(pEnv), 
 				   (dvoid **)&OCI(pError),
@@ -332,8 +338,8 @@ PHP_MINIT_FUNCTION(oci)
 	
 #endif
 
-	le_conn = register_list_destructors(_oci_connection_dtor, NULL);
 	le_stmt = register_list_destructors(_oci_statement_dtor, NULL);
+	le_conn = register_list_destructors(_oci_connection_dtor, NULL);
 
 	INIT_CLASS_ENTRY(oci_lob_class_entry, "OCI-Lob", php_oci_lob_class_functions);
 
@@ -435,9 +441,11 @@ PHP_MSHUTDOWN_FUNCTION(oci)
 
 	zend_hash_destroy(OCI(user));
 	zend_hash_destroy(OCI(server));
+	zend_hash_destroy(OCI(conns));
 
 	free(OCI(user));
 	free(OCI(server));
+	free(OCI(conns));
 
 	OCIHandleFree((dvoid *)OCI(pEnv), OCI_HTYPE_ENV);
 
@@ -518,6 +526,7 @@ _oci_define_dtor(void *data)
 		efree(define->name);
 		define->name = 0;
 	}
+
 	return 1;
 }
 
@@ -528,12 +537,16 @@ static int
 _oci_column_dtor(void *data)
 {	
 	oci_out_column *column = (oci_out_column *) data;
+	oci_connection *db_conn;
+	OCILS_FETCH();
 
-	oci_debug("_oci_column_dtor: %s",column->name);
+	oci_debug("START _oci_column_dtor: %s",column->name);
 
 	if (column->data) {
 		if (column->is_descr) {
-			zend_hash_index_del(column->statement->conn->descriptors,(int) column->data);
+			if (zend_hash_find(OCI(conns),(void*)&(column->statement->conn),sizeof(void*),(void **)&db_conn) == SUCCESS) {
+				zend_hash_index_del(column->statement->conn->descriptors,(int) column->data);
+			}
 		} else {
 			if (column->data) {
 				efree(column->data);
@@ -541,6 +554,8 @@ _oci_column_dtor(void *data)
 		}
 	}
 
+	oci_debug("END _oci_column_dtor: %s",column->name);
+
 	if (column->name) {
 		efree(column->name);
 	}
@@ -598,18 +613,18 @@ _oci_statement_dtor(oci_statement *statement)
 static void
 _oci_connection_dtor(oci_connection *connection)
 {
-	if (! connection) {
-		return;
-	}
-
 	/* 
 	   as the connection is "only" a in memory service context we do not disconnect from oracle.
 	*/
 
-	oci_debug("_oci_connection_dtor: id=%d",connection->id);
+	OCILS_FETCH();
+
+	oci_debug("START _oci_connection_dtor: id=%d",connection->id);
+
+	zend_hash_del(OCI(conns),(void*)&connection,sizeof(void*));
 
 	if (connection->descriptors) {
-		zend_hash_destroy(connection->descriptors);
+   		zend_hash_destroy(connection->descriptors);
 		efree(connection->descriptors);
 	}
 
@@ -621,6 +636,8 @@ _oci_connection_dtor(oci_connection *connection)
 		OCIHandleFree((dvoid *) connection->pError, (ub4) OCI_HTYPE_ERROR);
 	}
 
+	oci_debug("END _oci_connection_dtor: id=%d",connection->id);
+
 	efree(connection);
 }
 
@@ -2143,6 +2160,8 @@ static void oci_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent,int exclu
 
 	oci_debug("oci_do_connect: id=%d",connection->id);
 
+	zend_hash_add(OCI(conns),(void*)&connection,sizeof(void*),(void*)&connection,sizeof(void*),NULL);
+
 	RETURN_RESOURCE(connection->id);
 	
  CLEANUP:
diff --git a/ext/oci8/php3_oci8.h b/ext/oci8/php3_oci8.h
index 7c164c2055..aee3d451d0 100644
--- a/ext/oci8/php3_oci8.h
+++ b/ext/oci8/php3_oci8.h
@@ -168,6 +168,8 @@ typedef struct {
 	int user_num;
 	HashTable *user;
 
+	HashTable *conns;
+
     OCIEnv *pEnv;
 } php_oci_globals;
 
-- 
2.49.0