n-api: throw when entry point is null

Gabriel Schulhof · rvagg · commit 7033bbaa012a · 2018-08-16T11:38:52.000+10:00
Backport-PR-URL: #21732 PR-URL: #20779 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
diff --git a/src/node_api.cc b/src/node_api.cc
@@ -866,6 +866,12 @@ void napi_module_register_cb(v8::Local<v8::Object> exports,
                              void* priv) {
   napi_module* mod = static_cast<napi_module*>(priv);
 
+  if (mod->nm_register_func == nullptr) {
+    node::Environment::GetCurrent(context)->ThrowError(
+        "Module has no declared entry point.");
+    return;
+  }
+
   // Create a new napi_env for this module or reference one if a pre-existing
   // one is found.
   napi_env env = v8impl::GetEnv(context);
diff --git a/test/addons-napi/test_null_init/binding.gyp b/test/addons-napi/test_null_init/binding.gyp
@@ -0,0 +1,8 @@
+{
+  'targets': [
+    {
+      'target_name': 'test_null_init',
+      'sources': [ 'test_null_init.c' ]
+    }
+  ]
+}
diff --git a/test/addons-napi/test_null_init/test.js b/test/addons-napi/test_null_init/test.js
@@ -0,0 +1,7 @@
+'use strict';
+const common = require('../../common');
+const assert = require('assert');
+
+assert.throws(
+  () => require(`./build/${common.buildType}/test_null_init`),
+  /Module has no declared entry point[.]/);
diff --git a/test/addons-napi/test_null_init/test_null_init.c b/test/addons-napi/test_null_init/test_null_init.c
@@ -0,0 +1,3 @@
+#include <node_api.h>
+
+NAPI_MODULE(NODE_GYP_MODULE_NAME, NULL)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#include <node_api.h>`
	`2`	`+`
	`3`	`+NAPI_MODULE(NODE_GYP_MODULE_NAME, NULL)`