Skip to content

draft: implement bufferToString #45562

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

Closed
kiliczsh wants to merge 9 commits into from
Closed

draft: implement bufferToString #45562

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7106dc3
src: implement bufferToString
kiliczsh Nov 21, 2022
ab2c5b4
src: update bufferToString
kiliczsh Nov 21, 2022
48798ef
src: bufferToString argument checks
kiliczsh Nov 21, 2022
698f5e2
src: add string case for bufferToString
kiliczsh Nov 21, 2022
0be4196
src: fix errors for bufferToString
kiliczsh Nov 21, 2022
d84a7d4
src: add string case
kiliczsh Nov 21, 2022
bb557ae
src: fix check error and add string case
kiliczsh Nov 22, 2022
778ec39
src: add IsSharedArrayBuffer
kiliczsh Nov 22, 2022
b8cd296
src: fix for string
kiliczsh Nov 24, 2022
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
src: fix for string
  • Loading branch information
@kiliczsh
kiliczsh committed Nov 24, 2022
commit b8cd296e55805fdc4b0bd65837cfa15cd39eca91
30 changes: 13 additions & 17 deletions src/node_buffer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,30 +534,26 @@ 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;
Local<Value> ret;
MaybeLocal<Value> maybe_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);
if (buffer.length() == 0) { return args.GetReturnValue().SetEmptyString(); }
maybe_ret = StringBytes::Encode(isolate, buffer.data(), buffer.length(), from_encoding, &error);
} else if (args[0]->IsString()) {
if (New(isolate, args[0].As<String>(), to_encoding).ToLocal(&ret)) {
return args.GetReturnValue().Set(ret);
}
String::Utf8Value value(isolate, args[0].As<String>());
char* str(*value);
maybe_ret = StringBytes::Encode(isolate, str, to_encoding, &error);
}
if (!maybe_ret.ToLocal(&ret)) {
CHECK(!error.IsEmpty());
isolate->ThrowException(error);
return;
}
args.GetReturnValue().Set(ret);
}

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