summaryrefslogtreecommitdiff
path: root/src/util.cc
diff options
context:
space:
mode:
authorUjjwal Sharma <usharma1998@gmail.com>2018-08-29 15:39:55 +0200
committerAnna Henningsen <anna@addaleax.net>2018-09-02 14:25:16 +0200
commita55c57b8c48d4d09d3fb74ffddab6e87d10f2030 (patch)
treeabfb494acec7b5bdc1e817a2f9de4a3cb9c11de7 /src/util.cc
parent67403b3a849f86ccd03bcf3b829a89d74471f9ca (diff)
downloadandroid-node-v8-a55c57b8c48d4d09d3fb74ffddab6e87d10f2030.tar.gz
android-node-v8-a55c57b8c48d4d09d3fb74ffddab6e87d10f2030.tar.bz2
android-node-v8-a55c57b8c48d4d09d3fb74ffddab6e87d10f2030.zip
src: rework (mostly internal) functions to use Maybes
Rework all affected functions to use Maybes, thus improving error handling substantially in internal functions, API functions as well as utilities. Co-authored-by: Michaƫl Zasso <targos@protonmail.com> PR-URL: https://github.com/nodejs/node/pull/21935 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>
Diffstat (limited to 'src/util.cc')
-rw-r--r--src/util.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/util.cc b/src/util.cc
index b1b84d8f09..a0f0b0bf89 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -41,7 +41,9 @@ static void MakeUtf8String(Isolate* isolate,
Local<String> string;
if (!value->ToString(isolate->GetCurrentContext()).ToLocal(&string)) return;
- const size_t storage = StringBytes::StorageSize(isolate, string, UTF8) + 1;
+ size_t storage;
+ if (!StringBytes::StorageSize(isolate, string, UTF8).To(&storage)) return;
+ storage += 1;
target->AllocateSufficientStorage(storage);
const int flags =
String::NO_NULL_TERMINATION | String::REPLACE_INVALID_UTF8;