FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

n-api: add check for large strings · nodejs/node@5f469a2 · GitHub

/ node Public

Commit 5f469a2

Browse files
mhdawson
authored and
MylesBorins
committed
n-api: add check for large strings
n-api uses size_t for the size of strings when specifying string lengths. V8 only supports a size of int. Add a check so that an error will be returned if the user passes in a string with a size larger than will fit into an int. PR-URL: #15611 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
1 parent 3f2ea53 commit 5f469a2

3 files changed

Lines changed: 24 additions & 1 deletion

File tree

‎src/node_api.cc‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
#include <node_buffer.h>
1212
#include <node_object_wrap.h>
13+
#include <limits.h> // INT_MAX
1314
#include <string.h>
1415
#include <algorithm>
1516
#include <cmath>
@@ -125,6 +126,9 @@ struct napi_env__ {
125126
do { \
126127
static_assert(static_cast<int>(NAPI_AUTO_LENGTH) == -1, \
127128
"Casting NAPI_AUTO_LENGTH to int must result in -1"); \
129+
RETURN_STATUS_IF_FALSE((env), \
130+
(len == NAPI_AUTO_LENGTH) || len <= INT_MAX, \
131+
napi_invalid_arg); \
128132
auto str_maybe = v8::String::NewFromUtf8( \
129133
(env)->isolate, (str), v8::NewStringType::kInternalized, \
130134
static_cast<int>(len)); \
@@ -866,7 +870,7 @@ void napi_module_register(napi_module* mod) {
866870

867871
// Warning: Keep in-sync with napi_status enum
868872
const char* error_messages[] = {nullptr,
869-
"Invalid pointer passed as argument",
873+
"Invalid argument",
870874
"An object was expected",
871875
"A string was expected",
872876
"A string or symbol was expected",

‎test/addons-napi/test_string/test.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,7 @@ assert.strictEqual(test_string.TestUtf8Insufficient(str6), str6.slice(0, 1));
6969
assert.strictEqual(test_string.TestUtf16Insufficient(str6), str6.slice(0, 3));
7070
assert.strictEqual(test_string.Utf16Length(str6), 5);
7171
assert.strictEqual(test_string.Utf8Length(str6), 14);
72+
73+
assert.throws(() => {
74+
test_string.TestLargeUtf8();
75+
}, /^Error: Invalid argument$/);

‎test/addons-napi/test_string/test_string.c‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#include <limits.h> // INT_MAX
12
#include <node_api.h>
23
#include "../common.h"
34

@@ -201,6 +202,19 @@ napi_value Utf8Length(napi_env env, napi_callback_info info) {
201202
return output;
202203
}
203204

205+
napi_value TestLargeUtf8(napi_env env, napi_callback_info info) {
206+
napi_value output;
207+
if (SIZE_MAX > INT_MAX) {
208+
NAPI_CALL(env, napi_create_string_utf8(env, "", ((size_t)INT_MAX) + 1, &output));
209+
} else {
210+
// just throw the expected error as there is nothing to test
211+
// in this case since we can't overflow
212+
NAPI_CALL(env, napi_throw_error(env, NULL, "Invalid argument"));
213+
}
214+
215+
return output;
216+
}
217+
204218
napi_value Init(napi_env env, napi_value exports) {
205219
napi_property_descriptor properties[] = {
206220
DECLARE_NAPI_PROPERTY("TestLatin1", TestLatin1),
@@ -211,6 +225,7 @@ napi_value Init(napi_env env, napi_value exports) {
211225
DECLARE_NAPI_PROPERTY("TestUtf16Insufficient", TestUtf16Insufficient),
212226
DECLARE_NAPI_PROPERTY("Utf16Length", Utf16Length),
213227
DECLARE_NAPI_PROPERTY("Utf8Length", Utf8Length),
228+
DECLARE_NAPI_PROPERTY("TestLargeUtf8", TestLargeUtf8),
214229
};
215230

216231
NAPI_CALL(env, napi_define_properties(

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL