fix(response): ensure null or client/server response is returned

mongodb-js · Jul 8, 2018 · 083518f · 083518f
1 parent b365934
commit 083518f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/kerberos_client.cc b/src/kerberos_client.cc
@@ -93,11 +93,12 @@ class ClientStepWorker : public Nan::AsyncWorker {
  private:
   virtual void HandleOKCallback() {
     Nan::HandleScope scope;
-    v8::Local<v8::Value> argv[] = {
-      Nan::Null(),
-      Nan::New(_client->_state->response).ToLocalChecked()
-    };
+    v8::Local<v8::Value> response = Nan::Null();
+    if (_client->_state->response != NULL) {
+      response = Nan::New(_client->_state->response).ToLocalChecked();
+    }
 
+    v8::Local<v8::Value> argv[] = { Nan::Null(), response };
     callback->Call(2, argv, async_resource);
   }
 

diff --git a/src/kerberos_server.cc b/src/kerberos_server.cc
@@ -93,11 +93,12 @@ class ServerStepWorker : public Nan::AsyncWorker {
  private:
   virtual void HandleOKCallback() {
     Nan::HandleScope scope;
-    v8::Local<v8::Value> argv[] = {
-      Nan::Null(),
-      Nan::New(_server->_state->response).ToLocalChecked()
-    };
+    v8::Local<v8::Value> response = Nan::Null();
+    if (_server->_state->response != NULL) {
+      response = Nan::New(_server->_state->response).ToLocalChecked();
+    }
 
+    v8::Local<v8::Value> argv[] = { Nan::Null(), response };
     callback->Call(2, argv, async_resource);
   }