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: add string case for bufferToString
  • Loading branch information
kiliczsh committed Nov 21, 2022
commit 698f5e2f6a3781a331e154b212da817675bf3a0c
34 changes: 19 additions & 15 deletions src/node_buffer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -543,23 +543,27 @@ void BufferToString(const FunctionCallbackInfo<Value>& args) {
if (args[0]->IsArrayBuffer() || args[0]->IsSharedArrayBuffer() ||
args[0]->IsArrayBufferView()) {
ArrayBufferViewContents<char> buffer(args[0]);
}

if (buffer.length() == 0) {
return args.GetReturnValue().SetEmptyString();
}

Local<Value> error;
MaybeLocal<Value> maybe_ret = StringBytes::Encode(
isolate, buffer.data() + start, length, encoding, &error);

Local<Value> ret;
if (!maybe_ret.ToLocal(&ret)) {
CHECK(!error.IsEmpty());
isolate->ThrowException(error);
return;
if (buffer.length() == 0) {
return args.GetReturnValue().SetEmptyString();
}
Local<Value> error;
MaybeLocal<Value> maybe_ret = StringBytes::Encode(
isolate, buffer.data() + start, length, encoding, &error);

Local<Value> ret;
if (!maybe_ret.ToLocal(&ret)) {
CHECK(!error.IsEmpty());
isolate->ThrowException(error);
return;
}
args.GetReturnValue().Set(ret);
} else if (args[0]->IsString()) {
Local<Object> buf;
if (New(isolate, args[0].As<String>(), enc).ToLocal(&buf)) {
args.GetReturnValue().Set(buf);
}
}
args.GetReturnValue().Set(ret);
}

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