Skip to content

node-api: use WriteOneByteV2 in napi_get_value_string_latin1 #58325

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

node-api: use WriteOneByteV2 in napi_get_value_string_latin1 #58325

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions src/js_native_api_v8.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2441,21 +2441,21 @@ napi_status NAPI_CDECL napi_get_value_string_latin1(

v8::Local<v8::Value> val = v8impl::V8LocalValueFromJsValue(value);
RETURN_STATUS_IF_FALSE(env, val->IsString(), napi_string_expected);
v8::Local<v8::String> str = val.As<v8::String>();

if (!buf) {
CHECK_ARG(env, result);
*result = val.As<v8::String>()->Length();
*result = str->Length();
} else if (bufsize != 0) {
int copied =
val.As<v8::String>()->WriteOneByte(env->isolate,
reinterpret_cast<uint8_t*>(buf),
0,
bufsize - 1,
v8::String::NO_NULL_TERMINATION);

buf[copied] = '\0';
uint32_t length = static_cast<uint32_t>(
std::min(bufsize - 1, static_cast<size_t>(str->Length())));
str->WriteOneByteV2(env->isolate,
0,
length,
reinterpret_cast<uint8_t*>(buf),
v8::String::WriteFlags::kNullTerminate);
if (result != nullptr) {
*result = copied;
*result = length;
}
} else if (result != nullptr) {
*result = 0;
Expand All @@ -2479,12 +2479,12 @@ napi_status NAPI_CDECL napi_get_value_string_utf8(

v8::Local<v8::Value> val = v8impl::V8LocalValueFromJsValue(value);
RETURN_STATUS_IF_FALSE(env, val->IsString(), napi_string_expected);
v8::Local<v8::String> str = val.As<v8::String>();

if (!buf) {
CHECK_ARG(env, result);
*result = val.As<v8::String>()->Utf8LengthV2(env->isolate);
*result = str->Utf8LengthV2(env->isolate);
} else if (bufsize != 0) {
auto str = val.As<v8::String>();
size_t copied =
str->WriteUtf8V2(env->isolate,
buf,
Expand Down
Loading