Skip to content

Commit ec607e4

Browse files
committed
src: use non-deprecated Utf8LengthV2() method
1 parent a213815 commit ec607e4

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

benchmark/napi/function_args/binding.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ void CallWithString(const FunctionCallbackInfo<Value>& args) {
2121
assert(args.Length() == 1 && args[0]->IsString());
2222
if (args.Length() == 1 && args[0]->IsString()) {
2323
Local<String> str = args[0].As<String>();
24-
const int32_t length = str->Utf8Length(args.GetIsolate()) + 1;
24+
const size_t length = str->Utf8LengthV2(args.GetIsolate()) + 1;
2525
char* buf = new char[length];
2626
str->WriteUtf8(args.GetIsolate(), buf, length);
2727
delete[] buf;

src/crypto/crypto_util.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ ByteSource ByteSource::FromStringOrBuffer(Environment* env,
399399
ByteSource ByteSource::FromString(Environment* env, Local<String> str,
400400
bool ntc) {
401401
CHECK(str->IsString());
402-
size_t size = str->Utf8Length(env->isolate());
402+
size_t size = str->Utf8LengthV2(env->isolate());
403403
size_t alloc_size = ntc ? size + 1 : size;
404404
auto out = DataPointer::Alloc(alloc_size);
405405
int opts = String::NO_OPTIONS;

src/encoding_binding.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ void BindingData::EncodeUtf8String(const FunctionCallbackInfo<Value>& args) {
122122
CHECK(args[0]->IsString());
123123

124124
Local<String> str = args[0].As<String>();
125-
size_t length = str->Utf8Length(isolate);
125+
size_t length = str->Utf8LengthV2(isolate);
126126

127127
Local<ArrayBuffer> ab;
128128
{

src/js_native_api_v8.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2482,7 +2482,7 @@ napi_status NAPI_CDECL napi_get_value_string_utf8(
24822482

24832483
if (!buf) {
24842484
CHECK_ARG(env, result);
2485-
*result = val.As<v8::String>()->Utf8Length(env->isolate);
2485+
*result = val.As<v8::String>()->Utf8LengthV2(env->isolate);
24862486
} else if (bufsize != 0) {
24872487
int copied = val.As<v8::String>()->WriteUtf8(
24882488
env->isolate,

src/node_buffer.cc

+3-2
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ void Fill(const FunctionCallbackInfo<Value>& args) {
639639
// Can't use StringBytes::Write() in all cases. For example if attempting
640640
// to write a two byte character into a one byte Buffer.
641641
if (enc == UTF8) {
642-
str_length = str_obj->Utf8Length(env->isolate());
642+
str_length = str_obj->Utf8LengthV2(env->isolate());
643643
node::Utf8Value str(env->isolate(), args[1]);
644644
memcpy(ts_obj_data + start, *str, std::min(str_length, fill_length));
645645

@@ -728,7 +728,8 @@ void SlowByteLengthUtf8(const FunctionCallbackInfo<Value>& args) {
728728
CHECK(args[0]->IsString());
729729

730730
// Fast case: avoid StringBytes on UTF8 string. Jump to v8.
731-
args.GetReturnValue().Set(args[0].As<String>()->Utf8Length(env->isolate()));
731+
size_t result = args[0].As<String>()->Utf8LengthV2(env->isolate());
732+
args.GetReturnValue().Set(static_cast<uint64_t>(result));
732733
}
733734

734735
uint32_t FastByteLengthUtf8(Local<Value> receiver,

0 commit comments

Comments
 (0)