Skip to content

napi: Improve performance creating strings #26439

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
anthony-tuininga wants to merge 4 commits into from
Closed

napi: Improve performance creating strings #26439

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca9ea3a
Improve performance creating strings using N-API by ensuring that the…
anthony-tuininga Mar 4, 2019
b94b312
Add missing check.
anthony-tuininga Mar 4, 2019
64171a9
Add checks on length to other two string creation methods.
anthony-tuininga Mar 5, 2019
ed195b6
Added test cases for verifying additional checks on latin-1 and utf-1…
anthony-tuininga Mar 5, 2019
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
Added test cases for verifying additional checks on latin-1 and utf-1… 
…6 string

sizes.
  • Loading branch information
@anthony-tuininga
anthony-tuininga committed Mar 5, 2019
commit ed195b6eeb859e4dcdca1a66e8ec8d179ac17e90
8 changes: 8 additions & 0 deletions test/js-native-api/test_string/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,11 @@ assert.strictEqual(test_string.Utf8Length(str6), 14);
assert.throws(() => {
test_string.TestLargeUtf8();
}, /^Error: Invalid argument$/);

assert.throws(() => {
test_string.TestLargeLatin1();
}, /^Error: Invalid argument$/);

assert.throws(() => {
test_string.TestLargeUtf16();
}, /^Error: Invalid argument$/);
28 changes: 28 additions & 0 deletions test/js-native-api/test_string/test_string.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,32 @@ static napi_value TestLargeUtf8(napi_env env, napi_callback_info info) {
return output;
}

static napi_value TestLargeLatin1(napi_env env, napi_callback_info info) {
napi_value output;
if (SIZE_MAX > INT_MAX) {
NAPI_CALL(env, napi_create_string_latin1(env, "", ((size_t)INT_MAX) + 1, &output));
} else {
// just throw the expected error as there is nothing to test
// in this case since we can't overflow
NAPI_CALL(env, napi_throw_error(env, NULL, "Invalid argument"));
}

return output;
}

static napi_value TestLargeUtf16(napi_env env, napi_callback_info info) {
napi_value output;
if (SIZE_MAX > INT_MAX) {
NAPI_CALL(env, napi_create_string_utf16(env, "", ((size_t)INT_MAX) + 1, &output));
} else {
// just throw the expected error as there is nothing to test
// in this case since we can't overflow
NAPI_CALL(env, napi_throw_error(env, NULL, "Invalid argument"));
}

return output;
}

EXTERN_C_START
napi_value Init(napi_env env, napi_value exports) {
napi_property_descriptor properties[] = {
Expand All @@ -228,6 +254,8 @@ napi_value Init(napi_env env, napi_value exports) {
DECLARE_NAPI_PROPERTY("Utf16Length", Utf16Length),
DECLARE_NAPI_PROPERTY("Utf8Length", Utf8Length),
DECLARE_NAPI_PROPERTY("TestLargeUtf8", TestLargeUtf8),
DECLARE_NAPI_PROPERTY("TestLargeLatin1", TestLargeLatin1),
DECLARE_NAPI_PROPERTY("TestLargeUtf16", TestLargeUtf16),
};

NAPI_CALL(env, napi_define_properties(
Expand Down