Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.

Use NO_NULL_TERMINATION flag for the conversion from String to bytes #1902

Closed
wants to merge 1 commit into from
Closed

Use NO_NULL_TERMINATION flag for the conversion from String to bytes #1902

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
17 changes: 6 additions & 11 deletions src/node_buffer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,19 +493,12 @@ Handle<Value> Buffer::Utf8Write(const Arguments &args) {
int written = s->WriteUtf8(p,
max_length,
&char_written,
String::HINT_MANY_WRITES_EXPECTED);
(String::HINT_MANY_WRITES_EXPECTED |
String::NO_NULL_TERMINATION));

constructor_template->GetFunction()->Set(chars_written_sym,
Integer::New(char_written));

if (written > 0 && p[written-1] == '\0' && char_written == length) {
uint16_t last_char;
s->Write(&last_char, length - 1, 1, String::NO_OPTIONS);
if (last_char != 0 || written > s->Utf8Length()) {
written--;
}
}

return scope.Close(Integer::New(written));
}

Expand Down Expand Up @@ -538,7 +531,8 @@ Handle<Value> Buffer::Ucs2Write(const Arguments &args) {
int written = s->Write(p,
0,
max_length,
String::HINT_MANY_WRITES_EXPECTED);
(String::HINT_MANY_WRITES_EXPECTED |
String::NO_NULL_TERMINATION));

constructor_template->GetFunction()->Set(chars_written_sym,
Integer::New(written));
Expand Down Expand Up @@ -576,7 +570,8 @@ Handle<Value> Buffer::AsciiWrite(const Arguments &args) {
int written = s->WriteAscii(p,
0,
max_length,
String::HINT_MANY_WRITES_EXPECTED);
(String::HINT_MANY_WRITES_EXPECTED |
String::NO_NULL_TERMINATION));

constructor_template->GetFunction()->Set(chars_written_sym,
Integer::New(written));
Expand Down