src: handle exceptions from ToDetailString()

These methods may fail if execution is terminating. PR-URL: #28019 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>
nodejs · Jun 17, 2019 · 8849eb2 · 8849eb2
1 parent 8a032fc
commit 8849eb2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/node_errors.cc b/src/node_errors.cc
@@ -180,7 +180,8 @@ void PrintException(Isolate* isolate,
                     Local<Value> err,
                     Local<Message> message) {
   node::Utf8Value reason(isolate,
-                         err->ToDetailString(context).ToLocalChecked());
+                         err->ToDetailString(context)
+                             .FromMaybe(Local<String>()));
   bool added_exception_line = false;
   std::string source =
       GetErrorSource(isolate, context, message, &added_exception_line);

diff --git a/src/node_util.cc b/src/node_util.cc
@@ -125,8 +125,10 @@ static void PreviewEntries(const FunctionCallbackInfo<Value>& args) {
 
 // Side effect-free stringification that will never throw exceptions.
 static void SafeToString(const FunctionCallbackInfo<Value>& args) {
-  auto context = args.GetIsolate()->GetCurrentContext();
-  args.GetReturnValue().Set(args[0]->ToDetailString(context).ToLocalChecked());
+  Local<Context> context = args.GetIsolate()->GetCurrentContext();
+  Local<String> detail_string;
+  if (args[0]->ToDetailString(context).ToLocal(&detail_string))
+    args.GetReturnValue().Set(detail_string);
 }
 
 inline Local<Private> IndexToPrivateSymbol(Environment* env, uint32_t index) {