Skip to content
Closed
Changes from 1 commit
Commits
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
Next Next commit
src: fix check error and add string case
  • Loading branch information
kiliczsh committed Nov 22, 2022
commit bb557ae681af53e76bfe21fb3a16237283ab87ce
33 changes: 16 additions & 17 deletions src/node_buffer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -520,12 +520,12 @@ MaybeLocal<Object> New(Environment* env,

namespace {

// TODO: Buffer.from(buf, fromEnc).toString(buf, toEnc)
// TODO(kiliczsh): Buffer.from(buf, fromEnc).toString(buf, toEnc)
void BufferToString(const FunctionCallbackInfo<Value>& args) {
CHECK_GE(args.Length(), 3);

// TODO: btoa('a') is throwing error: assertion failed
CHECK(args[0]->IsArrayBuffer() || args[0]->IsSharedArrayBuffer() ||
// TODO(kiliczsh): resolve IsSharedArrayBuffer failure
CHECK(args[0]->IsString() || args[0]->IsArrayBuffer() ||
args[0]->IsArrayBufferView());
CHECK(args[1]->IsString());
CHECK(args[2]->IsString());
Expand All @@ -536,31 +536,30 @@ void BufferToString(const FunctionCallbackInfo<Value>& args) {
enum encoding from_encoding = ParseEncoding(isolate, args[1], UTF8);
enum encoding to_encoding = ParseEncoding(isolate, args[2], UTF8);

Local<Value> error;
MaybeLocal<Value> maybe_ret;
Local<Value> ret;

if (args[0]->IsArrayBuffer() || args[0]->IsSharedArrayBuffer() ||
args[0]->IsArrayBufferView()) {

Local<Value> error;
MaybeLocal<Value> maybe_ret;
ArrayBufferViewContents<char> buffer(args[0]);
if (buffer.length() == 0) {
return args.GetReturnValue().SetEmptyString();
}
maybe_ret = StringBytes::Encode(
isolate, buffer.data(), buffer.length(), from_encoding, &error);
if (!maybe_ret.ToLocal(&ret)) {
CHECK(!error.IsEmpty());
isolate->ThrowException(error);
return;
}
return args.GetReturnValue().Set(ret);
} else if (args[0]->IsString()) {
ArrayBufferViewContents<char> buffer(args[0]);
size_t length = buffer.length();
const char* data = buffer.data();
maybe_ret = StringBytes::Encode(
isolate, data, length, to_encoding, &error);
}
Local<Value> ret;
if (!maybe_ret.ToLocal(&ret)) {
CHECK(!error.IsEmpty());
isolate->ThrowException(error);
return;
if (New(isolate, args[0].As<String>(), to_encoding).ToLocal(&ret)) {
return args.GetReturnValue().Set(ret);
}
}
args.GetReturnValue().Set(ret);
}

void CreateFromString(const FunctionCallbackInfo<Value>& args) {
Expand Down