Merge 153579 - *v8::String::Utf8Value can return NULL.

chrome/renderer/module_system.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/module_system.h"
 
 #include "base/bind.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScopedMicrotaskSuppression.h"
 
 namespace {
@@ skipping 43 matching lines @@
 // static
 bool ModuleSystem::IsPresentInCurrentContext() {
   v8::Handle<v8::Object> global(v8::Context::GetCurrent()->Global());
   v8::Handle<v8::Value> module_system =
       global->GetHiddenValue(v8::String::New(kModuleSystem));
   return !module_system.IsEmpty() && !module_system->IsUndefined();
 }
 
 // static
 void ModuleSystem::DumpException(const v8::TryCatch& try_catch) {
+  v8::HandleScope handle_scope;
+
   v8::Handle<v8::Message> message(try_catch.Message());
   if (message.IsEmpty()) {
     LOG(ERROR) << "try_catch has no message";
     return;
   }
 
   std::string resource_name = "<unknown resource>";
   if (!message->GetScriptResourceName().IsEmpty()) {
     resource_name =
         *v8::String::Utf8Value(message->GetScriptResourceName()->ToString());
   }
 
   std::string error_message = "<no error message>";
   if (!message->Get().IsEmpty())
     error_message = *v8::String::Utf8Value(message->Get());
 
   std::string stack_trace = "<stack trace unavailable>";
-  if (!try_catch.StackTrace().IsEmpty())
-    stack_trace = *v8::String::Utf8Value(try_catch.StackTrace());
+  if (!try_catch.StackTrace().IsEmpty()) {
+    v8::String::Utf8Value stack_value(try_catch.StackTrace());
+    if (*stack_value)
+      stack_trace.assign(*stack_value, stack_value.length());
+    else
+      stack_trace = "<could not convert stack trace to string>";
+  }
 
   LOG(ERROR) << "[" << resource_name << "(" << message->GetLineNumber() << ")] "
              << error_message
              << "{" << stack_trace << "}";
 }
 
 void ModuleSystem::Require(const std::string& module_name) {
   v8::HandleScope handle_scope;
   RequireForJsInner(v8::String::New(module_name.c_str()));
 }
@@ skipping 158 matching lines @@
   v8::Handle<v8::String> left =
       v8::String::New("(function(require, requireNative, exports) {");
   v8::Handle<v8::String> right = v8::String::New("\n})");
   return handle_scope.Close(
       v8::String::Concat(left, v8::String::Concat(source, right)));
 }
 
 v8::Handle<v8::Value> ModuleSystem::ThrowException(const std::string& message) {
   return v8::ThrowException(v8::String::New(message.c_str()));
 }