Skip to content

src: do proper StringBytes error handling #12765

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
addaleax wants to merge 4 commits into from
Closed

src: do proper StringBytes error handling #12765

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0aff46e
src: do proper StringBytes error handling
addaleax Apr 30, 2017
2ea112b
[squash] throw errors for crypto return
addaleax Apr 30, 2017
a65a5c3
[squash] remove goto → inline error statements
addaleax Apr 30, 2017
389af5a
[squash] remove indentation for the fast case
addaleax May 1, 2017
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
[squash] remove goto → inline error statements
  • Loading branch information
@addaleax
addaleax committed May 1, 2017
commit a65a5c3ede1c7fadc9a8be332c9cb95a9f5f2061
10 changes: 5 additions & 5 deletions src/string_bytes.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,7 +696,6 @@ MaybeLocal<Value> StringBytes::Encode(Isolate* isolate,
}

MaybeLocal<String> val;
char* out = nullptr;

switch (encoding) {
case BUFFER:
Expand All @@ -711,9 +710,8 @@ MaybeLocal<Value> StringBytes::Encode(Isolate* isolate,

case ASCII:
if (contains_non_ascii(buf, buflen)) {
out = node::UncheckedMalloc(buflen);
char* out = node::UncheckedMalloc(buflen);
if (out == nullptr) {
malloc_failed:
*error = SB_MALLOC_FAILED_ERROR;
return MaybeLocal<Value>();
}
Expand Down Expand Up @@ -741,7 +739,8 @@ MaybeLocal<Value> StringBytes::Encode(Isolate* isolate,
size_t dlen = base64_encoded_size(buflen);
char* dst = node::UncheckedMalloc(dlen);
if (dst == nullptr) {
goto malloc_failed;
*error = SB_MALLOC_FAILED_ERROR;
return MaybeLocal<Value>();
}

size_t written = base64_encode(buf, buflen, dst, dlen);
Expand All @@ -754,7 +753,8 @@ MaybeLocal<Value> StringBytes::Encode(Isolate* isolate,
size_t dlen = buflen * 2;
char* dst = node::UncheckedMalloc(dlen);
if (dst == nullptr) {
goto malloc_failed;
*error = SB_MALLOC_FAILED_ERROR;
return MaybeLocal<Value>();
}
size_t written = hex_encode(buf, buflen, dst, dlen);
CHECK_EQ(written, dlen);
Expand Down