From 1bb2ff590f1e3c8b9f64e2618dea6a53ac80fd87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tam=C3=A1s=20Gul=C3=A1csi?= <tgulacsi78@gmail.com>
Date: Tue, 19 Sep 2017 07:19:12 +0200
Subject: [PATCH] Do not free stmt.ocistmt - fixes #222

---
 stmt.go | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/stmt.go b/stmt.go
index dffb63e..63abfd1 100644
--- a/stmt.go
+++ b/stmt.go
@@ -150,28 +150,10 @@ func (stmt *Stmt) close() (err error) {
 			stmt.logF(true, "PANIC %v", err)
 			errs.PushBack(err)
 		}
-		// free ocistmt to release cursor on server
-		// OCIStmtRelease must be called with OCIStmtPrepare2
-		// See https://docs.oracle.com/database/121/LNOCI/oci09adv.htm#LNOCI16655
 		stmt.Lock()
 		env := stmt.Env()
 		ocistmt := stmt.ocistmt
-		r := C.OCIStmtRelease(
-			ocistmt,       // OCIStmt        *stmthp
-			env.ocierr,    // OCIError       *errhp,
-			nil,           // const OraText  *key
-			C.ub4(0),      // ub4 keylen
-			C.OCI_DEFAULT, // ub4 mode
-		)
-		stmt.Unlock()
-		if r == C.OCI_ERROR {
-			errs.PushBack(errE(env.ociError()))
-		}
-
-		C.OCIHandleFree(unsafe.Pointer(ocistmt), C.OCI_HTYPE_STMT)
 
-		stmt.SetCfg(StmtCfg{})
-		stmt.Lock()
 		stmt.stringPtrBufferSize = 0
 		stmt.env.Store((*Env)(nil))
 		stmt.ses = nil
@@ -185,6 +167,26 @@ func (stmt *Stmt) close() (err error) {
 		stmt.openRsets.clear()
 		_drv.stmtPool.Put(stmt)
 		stmt.Unlock()
+		stmt.SetCfg(StmtCfg{})
+
+		if ocistmt != nil {
+			// free ocistmt to release cursor on server
+			// OCIStmtRelease must be called with OCIStmtPrepare2
+			// See https://docs.oracle.com/database/121/LNOCI/oci09adv.htm#LNOCI16655
+			r := C.OCIStmtRelease(
+				ocistmt,       // OCIStmt        *stmthp
+				env.ocierr,    // OCIError       *errhp,
+				nil,           // const OraText  *key
+				C.ub4(0),      // ub4 keylen
+				C.OCI_DEFAULT, // ub4 mode
+			)
+			if r == C.OCI_ERROR {
+				errs.PushBack(errE(env.ociError()))
+				// Sometimes panics if free unconditionally - see #222.
+				// https://github.com/rana/ora/issues/222
+				C.OCIHandleFree(unsafe.Pointer(ocistmt), C.OCI_HTYPE_STMT)
+			}
+		}
 
 		multiErr := newMultiErrL(errs)
 		if multiErr != nil {