src: iterate on import attributes array correctly

The array's length is supposed to be a multiple of two. Fixes: nodejs#50700
targos · Nov 13, 2023 · 079fbca · 079fbca
1 parent 0304da2
commit 079fbca
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/src/module_wrap.cc b/src/module_wrap.cc
@@ -253,7 +253,8 @@ static Local<Object> createImportAttributesContainer(
     Environment* env, Isolate* isolate, Local<FixedArray> raw_attributes) {
   Local<Object> attributes =
       Object::New(isolate, v8::Null(env->isolate()), nullptr, nullptr, 0);
-  for (int i = 0; i < raw_attributes->Length(); i += 3) {
+  CHECK_EQ(raw_attributes->Length() % 2, 0);
+  for (int i = 0; i < raw_attributes->Length(); i += 2) {
     attributes
         ->Set(env->context(),
               raw_attributes->Get(env->context(), i).As<String>(),

diff --git a/test/es-module/test-esm-import-attributes-errors.js b/test/es-module/test-esm-import-attributes-errors.js
@@ -26,6 +26,11 @@ async function test() {
     { code: 'ERR_IMPORT_ATTRIBUTE_TYPE_INCOMPATIBLE' }
   );
 
+  await rejects(
+    import(jsModuleDataUrl, { with: { type: 'json', other: 'unsupported' } }),
+    { code: 'ERR_IMPORT_ATTRIBUTE_UNSUPPORTED' }
+  );
+
   await rejects(
     import(jsModuleDataUrl, { with: { type: 'unsupported' } }),
     { code: 'ERR_IMPORT_ATTRIBUTE_UNSUPPORTED' }

diff --git a/test/es-module/test-esm-import-attributes-errors.mjs b/test/es-module/test-esm-import-attributes-errors.mjs
@@ -21,6 +21,11 @@ await rejects(
   { code: 'ERR_IMPORT_ATTRIBUTE_TYPE_INCOMPATIBLE' }
 );
 
+await rejects(
+  import(jsModuleDataUrl, { with: { type: 'json', other: 'unsupported' } }),
+  { code: 'ERR_IMPORT_ATTRIBUTE_TYPE_INCOMPATIBLE' }
+);
+
 await rejects(
   import(import.meta.url, { with: { type: 'unsupported' } }),
   { code: 'ERR_IMPORT_ATTRIBUTE_UNSUPPORTED' }