Fixed Implict Result segfault under stress

Author: cjbj

src/njsConnection.c

@@ -614,7 +614,7 @@ static bool njsConnection_executePostAsync(njsBaton *baton, napi_env env,
                 metadata))
 
         // return result set
-        if (!njsResultSet_new(baton, env, baton->dpiStmtHandle, NULL,
+        if (!njsResultSet_new(baton, env, baton->dpiStmtHandle,
                 baton->queryVars, baton->numQueryVars, !baton->getRS,
                 &resultSet))
             return false;
@@ -1336,8 +1336,8 @@ static bool njsConnection_getImplicitResults(njsBaton *baton,
                 implicitResult->numQueryVars, env, baton))
             return false;
         if (!njsResultSet_new(baton, env, implicitResult->stmt,
-                baton->dpiStmtHandle, implicitResult->queryVars,
-                implicitResult->numQueryVars, !baton->getRS, &resultSet))
+                implicitResult->queryVars, implicitResult->numQueryVars,
+                !baton->getRS, &resultSet))
             return false;
         implicitResult->stmt = NULL;
         implicitResult->queryVars = NULL;

src/njsModule.h

@@ -614,7 +614,6 @@ struct njsPool {
 struct njsResultSet {
     NJS_INSTANCE_HEAD
     dpiStmt *handle;
-    dpiStmt *dependsOnHandle;
     njsConnection *conn;
     uint32_t numQueryVars;
     njsVariable *queryVars;
@@ -863,8 +862,8 @@ bool njsPool_newFromBaton(njsBaton *baton, napi_env env, napi_value *poolObj);
 // definition of functions for njsResultSet class
 //-----------------------------------------------------------------------------
 bool njsResultSet_new(njsBaton *baton, napi_env env, dpiStmt *handle,
-        dpiStmt *dependsOnHandle, njsVariable *vars, uint32_t numVars,
-        bool autoClose, napi_value *rsObj);
+        njsVariable *vars, uint32_t numVars, bool autoClose,
+        napi_value *rsObj);
 
 
 //-----------------------------------------------------------------------------

src/njsResultSet.c

@@ -99,12 +99,7 @@ static bool njsResultSet_closeAsync(njsBaton *baton)
 {
     njsResultSet *rs = (njsResultSet*) baton->callingInstance;
 
-    // implicit result sets cannot be closed, but releasing the reference to
-    // the statements will allow the parent result set to be closed
-    if (rs->dependsOnHandle) {
-        dpiStmt_release(rs->dependsOnHandle);
-        rs->dependsOnHandle = NULL;
-    } else if (dpiStmt_close(baton->dpiStmtHandle, NULL, 0) < 0) {
+    if (dpiStmt_close(baton->dpiStmtHandle, NULL, 0) < 0) {
         njsBaton_setErrorDPI(baton);
         rs->handle = baton->dpiStmtHandle;
         baton->dpiStmtHandle = NULL;
@@ -165,10 +160,6 @@ static void njsResultSet_finalize(napi_env env, void *finalizeData,
         dpiStmt_release(rs->handle);
         rs->handle = NULL;
     }
-    if (rs->dependsOnHandle) {
-        dpiStmt_release(rs->dependsOnHandle);
-        rs->dependsOnHandle = NULL;
-    }
     free(rs);
 }
 
@@ -235,10 +226,6 @@ static bool njsResultSet_getRowsAsync(njsBaton *baton)
     if ((!ok || !moreRows) && rs->autoClose) {
         dpiStmt_release(rs->handle);
         rs->handle = NULL;
-        if (rs->dependsOnHandle) {
-            dpiStmt_release(rs->dependsOnHandle);
-            rs->dependsOnHandle = NULL;
-        }
     }
 
     return ok;
@@ -402,8 +389,7 @@ static bool njsResultSet_getRowsProcessArgs(njsBaton *baton, napi_env env,
 // connection.
 //-----------------------------------------------------------------------------
 bool njsResultSet_new(njsBaton *baton, napi_env env, dpiStmt *handle,
-        dpiStmt *dependsOnHandle, njsVariable *vars, uint32_t numVars,
-        bool autoClose, napi_value *rsObj)
+        njsVariable *vars, uint32_t numVars, bool autoClose, napi_value *rsObj)
 {
     napi_value connObj;
     njsResultSet *rs;
@@ -421,15 +407,8 @@ bool njsResultSet_new(njsBaton *baton, napi_env env, dpiStmt *handle,
     NJS_CHECK_NAPI(env, napi_set_named_property(env, *rsObj, "_connection",
             connObj))
 
-    // if this result set depends on another ODPI-C statement remaining open,
-    // add a referene to it to make sure it doesn't get closed (used by
-    // implicit results)
-    if (dependsOnHandle && dpiStmt_addRef(dependsOnHandle) < 0)
-        return njsBaton_setErrorDPI(baton);
-
     // perform some initializations
     rs->handle = handle;
-    rs->dependsOnHandle = dependsOnHandle;
     rs->conn = (njsConnection*) baton->callingInstance;
     rs->numQueryVars = numVars;
     rs->queryVars = vars;

src/njsVariable.c

@@ -406,7 +406,7 @@ bool njsVariable_getScalarValue(njsVariable *var, njsVariableBuffer *buffer,
         case DPI_NATIVE_TYPE_STMT:
             if (dpiStmt_addRef(data->value.asStmt) < 0)
                 return njsBaton_setErrorDPI(baton);
-            if (!njsResultSet_new(baton, env, data->value.asStmt, NULL,
+            if (!njsResultSet_new(baton, env, data->value.asStmt,
                     buffer->queryVars, buffer->numQueryVars, false, value)) {
                 dpiStmt_release(data->value.asStmt);
                 return false;