From d835c84ba9e21cf91c71ff8db2104218e37f168a Mon Sep 17 00:00:00 2001
From: "Kevin (Kun) \"Kassimo\" Qian" <kevinkassimo@gmail.com>
Date: Wed, 9 Jan 2019 12:56:42 -0800
Subject: Prevent segfault when eval throws an error (#1411)

---
 libdeno/binding.cc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'libdeno/binding.cc')

diff --git a/libdeno/binding.cc b/libdeno/binding.cc
index c3232bae1..ef5d5a226 100644
--- a/libdeno/binding.cc
+++ b/libdeno/binding.cc
@@ -99,10 +99,13 @@ std::string EncodeExceptionAsJSON(v8::Local<v8::Context> context,
       CHECK(frame_obj
                 ->Set(context, v8_str("functionName"), frame->GetFunctionName())
                 .FromJust());
-      CHECK(frame_obj
-                ->Set(context, v8_str("scriptName"),
-                      frame->GetScriptNameOrSourceURL())
-                .FromJust());
+      // scriptName can be empty in special conditions e.g. eval
+      auto scriptName = frame->GetScriptNameOrSourceURL();
+      if (scriptName.IsEmpty()) {
+        scriptName = v8_str("<unknown>");
+      }
+      CHECK(
+          frame_obj->Set(context, v8_str("scriptName"), scriptName).FromJust());
       CHECK(frame_obj
                 ->Set(context, v8_str("isEval"),
                       v8::Boolean::New(isolate, frame->IsEval()))
-- 
cgit v1.2.3