Merge pull request joeferner#57 from raztus/master

Handle exceptions within callback functions by calling node::FatalException()
Newcomer520 · Jul 3, 2013 · c6feb9f · c6feb9f
2 parents 762de43 + 077f193
commit c6feb9f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/connection.cpp b/src/connection.cpp
@@ -347,7 +347,11 @@ void Connection::EIO_AfterCommit(uv_work_t* req, int status) {
 
   Handle<Value> argv[2];
   argv[0] = Undefined();
+  v8::TryCatch tryCatch;
   baton->callback->Call(Context::GetCurrent()->Global(), 1, argv);
+  if (tryCatch.HasCaught()) {
+    node::FatalException(tryCatch);
+  }
 
   delete baton;
 }
@@ -365,7 +369,11 @@ void Connection::EIO_AfterRollback(uv_work_t* req, int status) {
 
   Handle<Value> argv[2];
   argv[0] = Undefined();
+  v8::TryCatch tryCatch;
   baton->callback->Call(Context::GetCurrent()->Global(), 1, argv);
+  if (tryCatch.HasCaught()) {
+    node::FatalException(tryCatch);
+  }
 
   delete baton;
 }
@@ -715,7 +723,11 @@ void Connection::EIO_AfterExecute(uv_work_t* req, int status) {
         argv[1] = obj;
       }
     }
+    v8::TryCatch tryCatch;
     baton->callback->Call(Context::GetCurrent()->Global(), 2, argv);
+    if (tryCatch.HasCaught()) {
+      node::FatalException(tryCatch);
+    }
   } catch(NodeOracleException &ex) {
     Handle<Value> argv[2];
     argv[0] = Exception::Error(String::New(ex.getMessage().c_str()));

diff --git a/src/oracle_bindings.cpp b/src/oracle_bindings.cpp
@@ -111,7 +111,11 @@ void OracleClient::EIO_AfterConnect(uv_work_t* req, int status) {
     argv[1] = connection;
   }
 
+  v8::TryCatch tryCatch;
   baton->callback->Call(Context::GetCurrent()->Global(), 2, argv);
+  if (tryCatch.HasCaught()) {
+    node::FatalException(tryCatch);
+  }
 
   baton->callback.Dispose();
   if(baton->error) delete baton->error;