Merged: Avoid using stale InspectedContext pointers

src/inspector/inspected-context.cc

 // Copyright 2016 the V8 project 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 "src/inspector/inspected-context.h"
 
 #include "src/inspector/injected-script.h"
 #include "src/inspector/string-util.h"
 #include "src/inspector/v8-console.h"
 #include "src/inspector/v8-inspector-impl.h"
@@ skipping 56 matching lines @@
 }
 
 v8::Local<v8::Context> InspectedContext::context() const {
   return m_context.Get(isolate());
 }
 
 v8::Isolate* InspectedContext::isolate() const {
   return m_inspector->isolate();
 }
 
-void InspectedContext::createInjectedScript() {
+bool InspectedContext::createInjectedScript() {
   DCHECK(!m_injectedScript);
-  m_injectedScript = InjectedScript::create(this);
+  std::unique_ptr<InjectedScript> injectedScript = InjectedScript::create(this);
+  // InjectedScript::create can destroy |this|.
+  if (!injectedScript) return false;
+  m_injectedScript = std::move(injectedScript);
+  return true;
 }
 
 void InspectedContext::discardInjectedScript() { m_injectedScript.reset(); }
 
 }  // namespace v8_inspector