use std::basic_string_view to calc length in case of NAPI_AUTO_LENGTH

nodejs · Jun 6, 2023 · cf6e959 · cf6e959
1 parent 29bf3ab
commit cf6e959
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/js_native_api_v8.cc b/src/js_native_api_v8.cc
@@ -1469,6 +1469,9 @@ napi_status NAPI_CDECL node_api_create_external_string_latin1(
   return napi_create_string_latin1(env, str, length, result);
 #else
   return v8impl::NewString(env, str, length, result, [&](v8::Isolate* isolate) {
+    if (length == NAPI_AUTO_LENGTH) {
+      length = (std::string_view(str)).length();
+    }
     auto resource = new v8impl::ExternalOneByteStringResource(str, length);
     return v8::String::NewExternalOneByte(isolate, resource);
   });
@@ -1486,6 +1489,9 @@ napi_status NAPI_CDECL node_api_create_external_string_utf16(
   return napi_create_string_utf16(env, str, length, result);
 #else
   return v8impl::NewString(env, str, length, result, [&](v8::Isolate* isolate) {
+    if (length == NAPI_AUTO_LENGTH) {
+      length = (std::u16string_view(str)).length();
+    }
     auto resource = new v8impl::ExternalStringResource(
         reinterpret_cast<const uint16_t*>(str), length);
     return v8::String::NewExternalTwoByte(isolate, resource);

diff --git a/test/js-native-api/test_string/test_string.c b/test/js-native-api/test_string/test_string.c
@@ -6,6 +6,11 @@
 #include "../common.h"
 #include "test_null.h"
 
+enum length_mode {
+  own_length,
+  auto_length
+};
+
 static napi_status validate_and_retrieve_single_string_arg(
     napi_env env, napi_callback_info info, napi_value* arg) {
   size_t argc = 1;