test: make napi_get_buffer_info check if passed buffer is valid (#108)

toyobayashi · Feb 24, 2024 · 0472fe4 · 0472fe4
1 parent 107bda9
commit 0472fe4
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/packages/emnapi/src/value/convert2c.ts b/packages/emnapi/src/value/convert2c.ts
@@ -3,7 +3,7 @@ import { SIZE_TYPE, from64, makeGetValue, makeSetValue } from 'emscripten:parse-
 import { $emnapiSetValueI64 as emnapiSetValueI64 } from '../util'
 import { emnapiString } from '../string'
 import { emnapiExternalMemory } from '../memory'
-import { $CHECK_ARG, $CHECK_ENV_NOT_IN_GC, $PREAMBLE } from '../macro'
+import { $CHECK_ARG, $CHECK_ENV_NOT_IN_GC, $PREAMBLE, $RETURN_STATUS_IF_FALSE } from '../macro'
 
 /**
  * @__sig ippp
@@ -165,9 +165,7 @@ export function napi_get_buffer_info (
   const envObject: Env = $CHECK_ENV_NOT_IN_GC!(env)
   $CHECK_ARG!(envObject, buffer)
   const handle = emnapiCtx.handleStore.get(buffer)!
-  if (!handle.isBuffer()) {
-    return envObject.setLastError(napi_status.napi_invalid_arg)
-  }
+  $RETURN_STATUS_IF_FALSE!(envObject, handle.isBuffer(), napi_status.napi_invalid_arg)
   return napi_get_typedarray_info(env, buffer, 0, length, data, 0, 0)
 }
 

diff --git a/packages/test/buffer/binding.c b/packages/test/buffer/binding.c
@@ -140,6 +140,22 @@ static napi_value staticBuffer(napi_env env, napi_callback_info info) {
   return theBuffer;
 }
 
+static napi_value invalidObjectAsBuffer(napi_env env, napi_callback_info info) {
+  size_t argc = 1;
+  napi_value args[1];
+  NODE_API_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
+  NODE_API_ASSERT(env, argc == 1, "Wrong number of arguments");
+
+  napi_value notTheBuffer = args[0];
+  napi_status status = napi_get_buffer_info(env, notTheBuffer, NULL, NULL);
+  NODE_API_ASSERT(env,
+                  status == napi_invalid_arg,
+                  "napi_get_buffer_info: should fail with napi_invalid_arg "
+                  "when passed non buffer");
+
+  return notTheBuffer;
+}
+
 static napi_value getMemoryDataAsArray(napi_env env, napi_callback_info info) {
   size_t argc = 1;
   napi_value args[1];
@@ -190,6 +206,7 @@ static napi_value Init(napi_env env, napi_value exports) {
     DECLARE_NODE_API_PROPERTY("bufferHasInstance", bufferHasInstance),
     DECLARE_NODE_API_PROPERTY("bufferInfo", bufferInfo),
     DECLARE_NODE_API_PROPERTY("staticBuffer", staticBuffer),
+    DECLARE_NODE_API_PROPERTY("invalidObjectAsBuffer", invalidObjectAsBuffer),
     DECLARE_NODE_API_PROPERTY("getMemoryDataAsArray", getMemoryDataAsArray),
   };
 

diff --git a/packages/test/buffer/buffer.test.js b/packages/test/buffer/buffer.test.js
@@ -18,6 +18,9 @@ module.exports = load('buffer').then(async binding => {
     assert.strictEqual(binding.bufferInfo(buffer), true)
     buffer = null
     await common.gcUntil(() => binding.getDeleterCallCount() === 2)
+
+    // To test this doesn't crash
+    binding.invalidObjectAsBuffer({})
   })().then(common.mustCall())
 
   process.externalBuffer = binding.newExternalBuffer()