MFH:

destroy session after destroying error handle
SQLT_CHR is allowed too

1 files changed, 8 insertions, 6 deletions

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index a970b3b1b3..201ac7874c 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -836,18 +836,18 @@ _oci_conn_list_dtor(oci_connection *connection TSRMLS_DC)
 					(ub4) OCI_HTYPE_SVCCTX));
 	}
 
-	if (connection->session && connection->session->exclusive) {
-		/* exclusive connection created via OCINLogon() close their 
-		   associated session when destructed */
-		zend_list_delete(connection->session->num);
-	}
-
 	if (connection->pError) {
 		CALL_OCI(OCIHandleFree(
 					(dvoid *) connection->pError, 
 					(ub4) OCI_HTYPE_ERROR));
 	}
 
+	if (connection->session && connection->session->exclusive) {
+		/* exclusive connection created via OCINLogon() close their 
+		   associated session when destructed */
+		zend_list_delete(connection->session->num);
+	}
+
 	oci_debug("END   _oci_conn_list_dtor: id=%d",connection->id);
 
 	efree(connection);
@@ -2975,6 +2975,8 @@ break;
 			}
 			value_sz = sizeof(void*);
 			break;
+		case SQLT_CHR:
+			break;
 		default:
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown or unsupported datatype given: %u", ocitype);
 			RETURN_FALSE;