Sitelet https://github.com/nodejs/node/pull/43788/commits/cecfa5f34b65d586cec36fa92b1dfc89b0310d93
Skip to content

src,node-api: fix napi_check_object_type_tag() #43788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
daeyeon wants to merge 2 commits into from
Closed

src,node-api: fix napi_check_object_type_tag() #43788

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
036ad32
src: fix `napi_check_object_type_tag()`
daeyeon Jul 12, 2022
cecfa5f
fixup: apply the review
daeyeon Jul 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fixup: apply the review 
Signed-off-by: Daeyeon Jeong daeyeon.dev@gmail.com
  • Loading branch information
@daeyeon
daeyeon committed Jul 13, 2022
commit cecfa5f34b65d586cec36fa92b1dfc89b0310d93
4 changes: 2 additions & 2 deletions src/js_native_api_v8.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2457,9 +2457,9 @@ napi_status NAPI_CDECL napi_check_object_type_tag(napi_env env,
*result =
(tag.lower == type_tag->lower && tag.upper == type_tag->upper);
} else if (size == 1) {
*result = (tag.lower == type_tag->lower);
*result = (tag.lower == type_tag->lower && 0 == type_tag->upper);
} else if (size == 0) {
*result = (type_tag->lower == 0 && type_tag->upper == 0);
*result = (0 == type_tag->lower && 0 == type_tag->upper);
}
}
}
Expand Down
5 changes: 5 additions & 0 deletions test/js-native-api/test_object/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,11 @@ assert.strictEqual(newObject.test_string, 'test string');
// Verify that wrongly tagged objects are rejected.
assert.strictEqual(test_object.CheckTypeTag(0, obj2), false);
assert.strictEqual(test_object.CheckTypeTag(1, obj1), false);
assert.strictEqual(test_object.CheckTypeTag(0, obj3), false);
assert.strictEqual(test_object.CheckTypeTag(1, obj4), false);
assert.strictEqual(test_object.CheckTypeTag(2, obj4), false);
assert.strictEqual(test_object.CheckTypeTag(3, obj3), false);
assert.strictEqual(test_object.CheckTypeTag(4, obj3), false);

// Verify that untagged objects are rejected.
assert.strictEqual(test_object.CheckTypeTag(0, {}), false);
Expand Down
3 changes: 2 additions & 1 deletion test/js-native-api/test_object/test_object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,11 +605,12 @@ static napi_value TestSeal(napi_env env,
}

// We create two type tags. They are basically 128-bit UUIDs.
static const napi_type_tag type_tags[4] = {
static const napi_type_tag type_tags[5] = {
{ 0xdaf987b3cc62481a, 0xb745b0497f299531 },
{ 0xbb7936c374084d9b, 0xa9548d0762eeedb9 },
{ 0xa5ed9ce2e4c00c38, 0 },
{ 0, 0 },
{ 0xa5ed9ce2e4c00c38, 0xdaf987b3cc62481a },
};

static napi_value
Expand Down