Issue 6526 - *ToV8String() return MaybeLocal<> and check Call() return value

src/Utils.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 32 matching lines @@
 
 StringBuffer Utils::StringBufferFromV8String(v8::Isolate* isolate, const v8::Local<v8::Value>& value)
 {
   v8::String::Utf8Value stringValue(isolate, value);
   if (stringValue.length())
     return IFileSystem::IOBuffer(*stringValue, *stringValue + stringValue.length());
   else
     return IFileSystem::IOBuffer();
 }
 
-v8::Local<v8::String> Utils::ToV8String(v8::Isolate* isolate, const std::string& str)
+v8::MaybeLocal<v8::String> Utils::ToV8String(v8::Isolate* isolate, const std::string& str)
 {
   return v8::String::NewFromUtf8(isolate, str.c_str(),
-    v8::String::NewStringType::kNormalString, str.length());
+    v8::NewStringType::kNormal, str.length());
 }
 
-v8::Local<v8::String> Utils::StringBufferToV8String(v8::Isolate* isolate, const StringBuffer& str)
+v8::MaybeLocal<v8::String> Utils::StringBufferToV8String(v8::Isolate* isolate, const StringBuffer& str)
 {
   return v8::String::NewFromUtf8(isolate,
     reinterpret_cast<const char*>(str.data()),
-    v8::String::NewStringType::kNormalString, str.size());
+    v8::NewStringType::kNormal, str.size());
 }
 
 void Utils::ThrowExceptionInJS(v8::Isolate* isolate, const std::string& str)
 {
-  isolate->ThrowException(Utils::ToV8String(isolate, str));
+  auto maybe = Utils::ToV8String(isolate, str);
+  if (maybe.IsEmpty())
+  {
+    isolate->ThrowException(
+      Utils::ToV8String(isolate, "Unknown Exception").ToLocalChecked());
+  }
+  else
+    isolate->ThrowException(maybe.ToLocalChecked());
 }
 
 #ifdef _WIN32
 std::wstring Utils::ToUtf16String(const std::string& str)
 {
   size_t length = str.size();
   if (length == 0)
     return std::wstring();
 
   DWORD utf16StringLength = MultiByteToWideChar(CP_UTF8, 0, str.c_str(), length, NULL, 0);
@@ skipping 36 matching lines @@
     if (FAILED(hr))
     {
       throw std::runtime_error("CanonizeUrl failed\n");
     }
   }
   return canonizedUrl;
 
 }
 #endif