Merged: Avoid using stale InspectedContext pointers

src/inspector/injected-script.cc

Index: src/inspector/injected-script.cc
diff --git a/src/inspector/injected-script.cc b/src/inspector/injected-script.cc
index d379a50c7378bffe3f8d28230c27048682ec7002..a100dea2e1131dd22c0a23dec6e473d8e3f4c706 100644
--- a/src/inspector/injected-script.cc
+++ b/src/inspector/injected-script.cc
@@ -99,10 +99,16 @@ std::unique_ptr<InjectedScript> InjectedScript::create(
       v8::Number::New(isolate, inspectedContext->contextId())};
   v8::MicrotasksScope microtasksScope(isolate,
                                       v8::MicrotasksScope::kDoNotRunMicrotasks);
+
+  int contextGroupId = inspectedContext->contextGroupId();
+  int contextId = inspectedContext->contextId();
+  V8InspectorImpl* inspector = inspectedContext->inspector();
   v8::Local<v8::Value> injectedScriptValue;
   if (!function->Call(context, windowGlobal, arraysize(info), info)
            .ToLocal(&injectedScriptValue))
     return nullptr;
+  if (inspector->getContext(contextGroupId, contextId) != inspectedContext)
+    return nullptr;
   if (!injectedScriptValue->IsObject()) return nullptr;
   return wrapUnique(new InjectedScript(inspectedContext,
                                        injectedScriptValue.As<v8::Object>(),