From 7d3b7b101f04b28a6473ff2572bdabad43fdd726 Mon Sep 17 00:00:00 2001
From: Anthony Tuininga <anthony.tuininga@oracle.com>
Date: Wed, 30 Aug 2017 12:12:12 -0600
Subject: [PATCH] Eliminate segfault when attempting to reuse a REF cursor that
 has been closed.

---
 src/CursorVar.c   | 11 +++++++++++
 test/CursorVar.py | 18 ++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/src/CursorVar.c b/src/CursorVar.c
index 1d4d554..13b1ae9 100644
--- a/src/CursorVar.c
+++ b/src/CursorVar.c
@@ -46,16 +46,27 @@ static int CursorVar_SetValue(udt_Variable *var, uint32_t pos, dpiData *data,
         PyObject *value)
 {
     udt_Cursor *cursor;
+    dpiStmtInfo info;
 
     if (!PyObject_IsInstance(value, (PyObject*) &g_CursorType)) {
         PyErr_SetString(PyExc_TypeError, "expecting cursor");
         return -1;
     }
+
+    // if the cursor already has a handle, use it directly
     cursor = (udt_Cursor *) value;
     if (cursor->handle) {
         if (dpiVar_setFromStmt(var->handle, pos, cursor->handle) < 0)
             return Error_RaiseAndReturnInt();
+
+    // otherwise, make use of the statement handle allocated by the variable
+    // BUT, make sure the statement handle is still valid as it may have been
+    // closed by some other code; the call to dpiStmt_getInfo() will ensure the
+    // statement is still open; if an error occurs, this bind will be discarded
+    // and a second attempt will be made with a new cursor
     } else {
+        if (dpiStmt_getInfo(data->value.asStmt, &info) < 0)
+            return Error_RaiseAndReturnInt();
         cursor->handle = data->value.asStmt;
         dpiStmt_addRef(cursor->handle);
     }
diff --git a/test/CursorVar.py b/test/CursorVar.py
index a772b82..dfb34ef 100644
--- a/test/CursorVar.py
+++ b/test/CursorVar.py
@@ -50,6 +50,24 @@ class TestCursorVar(BaseTestCase):
         self.assertRaises(cx_Oracle.DatabaseError, cursor.execute, sql,
                 pcursor = cursor)
 
+    def testExecuteAfterClose(self):
+        "test executing a statement returning a ref cursor after closing it"
+        outCursor = self.connection.cursor()
+        sql = """
+                begin
+                    open :pcursor for
+                    select IntCol
+                    from TestNumbers
+                    order by IntCol;
+                end;"""
+        self.cursor.execute(sql, pcursor = outCursor)
+        rows = outCursor.fetchall()
+        outCursor.close()
+        outCursor = self.connection.cursor()
+        self.cursor.execute(sql, pcursor = outCursor)
+        rows2 = outCursor.fetchall()
+        self.assertEqual(rows, rows2)
+
     def testFetchCursor(self):
         "test fetching a cursor"
         self.cursor.execute("""