Add defensive checks

Author: Christopher Jones

src/njs/src/njsConnection.cpp

@@ -442,10 +442,13 @@ NAN_METHOD(Connection::Execute)
   NJS_GET_CALLBACK ( callback, info );
 
   connection = Nan::ObjectWrap::Unwrap<Connection>(info.This());
+
+  /* If connection is invalid from JS, then throw an exception */
+  NJS_CHECK_OBJECT_VALID2 ( connection, info ) ;
+
   eBaton *executeBaton = new eBaton ( connection->DBCount (), callback );
 
   NJS_CHECK_NUMBER_OF_ARGS ( executeBaton->error, info, 2, 4, exitExecute );
-  NJS_CHECK_OBJECT_VALID3( connection, executeBaton->error, exitExecute );
 
   if(!connection->isValid_)
   {
@@ -2599,10 +2602,13 @@ NAN_METHOD(Connection::Release)
   ConnectionBusyStatus connStat;
 
   connection = Nan::ObjectWrap::Unwrap<Connection>(info.This());
+
+  /* If connection is invalide from JS, then throw an exception */
+  NJS_CHECK_OBJECT_VALID2 ( connection, info ) ;
+
   eBaton *releaseBaton = new eBaton ( connection->DBCount (), callback );
 
   NJS_CHECK_NUMBER_OF_ARGS ( releaseBaton->error, info, 1, 1, exitRelease );
-  NJS_CHECK_OBJECT_VALID3(connection, releaseBaton->error, exitRelease);
   if(!connection->isValid_)
   {
     releaseBaton->error = NJSMessages::getErrorMsg ( errInvalidConnection );
@@ -2722,10 +2728,13 @@ NAN_METHOD(Connection::Commit)
   NJS_GET_CALLBACK ( callback, info );
 
   connection = Nan::ObjectWrap::Unwrap<Connection>(info.This());
+
+  /* if connection is invalid from JS, then throw an exception */
+  NJS_CHECK_OBJECT_VALID2 ( connection, info ) ;
+
   eBaton *commitBaton = new eBaton ( connection->DBCount (), callback );
 
   NJS_CHECK_NUMBER_OF_ARGS ( commitBaton->error, info, 1, 1, exitCommit );
-  NJS_CHECK_OBJECT_VALID3 ( connection, commitBaton->error, exitCommit );
   if(!connection->isValid_)
   {
     commitBaton->error = NJSMessages::getErrorMsg ( errInvalidConnection );
@@ -2826,9 +2835,11 @@ NAN_METHOD(Connection::Rollback)
   NJS_GET_CALLBACK ( callback, info );
 
   connection = Nan::ObjectWrap::Unwrap<Connection>(info.This());
+  /* if connection is invalid from JS, then throw an exception */
+  NJS_CHECK_OBJECT_VALID2 ( connection, info );
+
   eBaton *rollbackBaton = new eBaton ( connection->DBCount (), callback );
   NJS_CHECK_NUMBER_OF_ARGS ( rollbackBaton->error, info, 1, 1, exitRollback );
-  NJS_CHECK_OBJECT_VALID3 ( connection, rollbackBaton->error, exitRollback );
 
   if(!connection->isValid_)
   {
@@ -2927,10 +2938,13 @@ NAN_METHOD(Connection::Break)
   NJS_GET_CALLBACK ( callback, info );
 
   connection = Nan::ObjectWrap::Unwrap<Connection>(info.This());
+
+  /* If connection is invalid from JS, then throw an exception */
+  NJS_CHECK_OBJECT_VALID2 ( connection, info );
+
   eBaton *breakBaton = new eBaton ( connection->DBCount (), callback );
 
   NJS_CHECK_NUMBER_OF_ARGS ( breakBaton->error, info, 1, 1, exitBreak );
-  NJS_CHECK_OBJECT_VALID3 ( connection, breakBaton->error, exitBreak );
 
   if(!connection->isValid_)
   {

src/njs/src/njsIntLob.cpp

@@ -835,12 +835,14 @@ NAN_METHOD(ILob::Read)
 
   NJS_GET_CALLBACK(callback, info);
   iLob = Nan::ObjectWrap::Unwrap<ILob>(info.This());
+
+  /* If iLob object is invalid from JS, then throw an exception */
+  NJS_CHECK_OBJECT_VALID2 (iLob, info);
+
   LobBaton *lobBaton = new LobBaton ( iLob->njsconn_->LOBCount (), callback );
 
   NJS_CHECK_NUMBER_OF_ARGS (lobBaton->error, info, 1, 1, exitRead);
 
-  NJS_CHECK_OBJECT_VALID3(iLob, lobBaton->error, exitRead);
-
   if(!iLob->isValid_)
   {
     lobBaton->error = NJSMessages::getErrorMsg(errInvalidLob);
@@ -1032,11 +1034,14 @@ NAN_METHOD(ILob::Write)
 
   NJS_GET_CALLBACK(callback, info);
   iLob = Nan::ObjectWrap::Unwrap<ILob>(info.This());
+
+  /* If iLob is invalid from JS, then throw an exception */
+  NJS_CHECK_OBJECT_VALID2 ( iLob, info );
+
   LobBaton *lobBaton = new LobBaton ( iLob->njsconn_->LOBCount (), callback );
 
   NJS_CHECK_NUMBER_OF_ARGS (lobBaton->error, info, 2, 2, exitWrite);
 
-  NJS_CHECK_OBJECT_VALID3 ( iLob, lobBaton->error, exitWrite);
   if(!iLob->isValid_)
   {
     lobBaton->error = NJSMessages::getErrorMsg(errInvalidLob);

src/njs/src/njsResultSet.cpp

@@ -244,17 +244,14 @@ NAN_METHOD(ResultSet::GetRow)
   NJS_GET_CALLBACK ( callback, info );
 
   ResultSet *njsResultSet = Nan::ObjectWrap::Unwrap<ResultSet>(info.This());
+
+  /* If njsResultSet is invalid from JS, then throw an exception */
+  NJS_CHECK_OBJECT_VALID2 ( njsResultSet, info );
+
   rsBaton   *getRowsBaton = new rsBaton ( njsResultSet->njsconn_->RSCount (),
                                           callback );
   getRowsBaton->njsRS = njsResultSet;
 
-  if ( !njsResultSet )
-  {
-    getRowsBaton->error = NJSMessages::getErrorMsg ( errInvalidJSObject ) ;
-    // donot alter the state while exiting
-    getRowsBaton->errOnActiveOrInvalid = true;
-    goto exitGetRow;
-  }
   if(njsResultSet->state_ == INVALID)
   {
     getRowsBaton->error = NJSMessages::getErrorMsg ( errInvalidResultSet );
@@ -295,17 +292,14 @@ NAN_METHOD(ResultSet::GetRows)
   NJS_GET_CALLBACK ( callback, info );
 
   ResultSet *njsResultSet = Nan::ObjectWrap::Unwrap<ResultSet>(info.This());
+
+  /* If njsResultSet is invalid from JS, then throw an exception */
+  NJS_CHECK_OBJECT_VALID2 ( njsResultSet, info );
+
   rsBaton   *getRowsBaton = new rsBaton ( njsResultSet->njsconn_->RSCount (),
                                           callback );
   getRowsBaton->njsRS = njsResultSet;
 
-  if ( !njsResultSet )
-  {
-    getRowsBaton->error = NJSMessages::getErrorMsg ( errInvalidJSObject );
-    getRowsBaton->errOnActiveOrInvalid = true;
-    goto exitGetRows;
-  }
-
   if(njsResultSet->state_ == INVALID)
   {
     getRowsBaton->error = NJSMessages::getErrorMsg ( errInvalidResultSet );
@@ -564,18 +558,14 @@ NAN_METHOD(ResultSet::Close)
   NJS_GET_CALLBACK ( callback, info );
 
   ResultSet *njsResultSet = Nan::ObjectWrap::Unwrap<ResultSet>(info.This());
+
+  /* If njsResultSet is invalid from JS, then throw an exception */
+  NJS_CHECK_OBJECT_VALID2 ( njsResultSet, info );
+
   rsBaton   *closeBaton = new rsBaton ( njsResultSet->njsconn_->RSCount (),
                                         callback );
   closeBaton->njsRS = njsResultSet;
 
-  if ( !njsResultSet )
-  {
-    closeBaton->error = NJSMessages::getErrorMsg ( errInvalidJSObject );
-    // donot alter the state while exiting
-    closeBaton->errOnActiveOrInvalid = true;
-    goto exitClose;
-  }
-
   if(njsResultSet->state_ == INVALID)
   {
     closeBaton->error = NJSMessages::getErrorMsg ( errInvalidResultSet );