Changeset 244285 in webkit

Timestamp:

Apr 15, 2019 1:29:30 PM (5 years ago)

Author:

Devin Rousso

Message:

Web Inspector: REGRESSION(r244172): crash when trying to add extra domain while inspecting JSContext
​https://bugs.webkit.org/show_bug.cgi?id=196925
<rdar://problem/49873994>

Reviewed by Joseph Pecoraro.

Move the logic for creating the InspectorAgent and InspectorDebuggerAgent into separate
functions so that callers can be guaranteed to have a valid instance of the agent.

• inspector/JSGlobalObjectInspectorController.h:
• inspector/JSGlobalObjectInspectorController.cpp:

(Inspector::JSGlobalObjectInspectorController::connectFrontend):
(Inspector::JSGlobalObjectInspectorController::frontendInitialized):
(Inspector::JSGlobalObjectInspectorController::appendExtraAgent):
(Inspector::JSGlobalObjectInspectorController::ensureInspectorAgent): Added.
(Inspector::JSGlobalObjectInspectorController::ensureDebuggerAgent): Added.
(Inspector::JSGlobalObjectInspectorController::createLazyAgents):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/JSGlobalObjectInspectorController.cpp (modified) (4 diffs)
• inspector/JSGlobalObjectInspectorController.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-04-15  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: REGRESSION(r244172): crash when trying to add extra domain while inspecting JSContext
+        https://bugs.webkit.org/show_bug.cgi?id=196925
+        <rdar://problem/49873994>
+
+        Reviewed by Joseph Pecoraro.
+
+        Move the logic for creating the `InspectorAgent` and `InspectorDebuggerAgent` into separate
+        functions so that callers can be guaranteed to have a valid instance of the agent.
+
+        * inspector/JSGlobalObjectInspectorController.h:
+        * inspector/JSGlobalObjectInspectorController.cpp:
+        (Inspector::JSGlobalObjectInspectorController::connectFrontend):
+        (Inspector::JSGlobalObjectInspectorController::frontendInitialized):
+        (Inspector::JSGlobalObjectInspectorController::appendExtraAgent):
+        (Inspector::JSGlobalObjectInspectorController::ensureInspectorAgent): Added.
+        (Inspector::JSGlobalObjectInspectorController::ensureDebuggerAgent): Added.
+        (Inspector::JSGlobalObjectInspectorController::createLazyAgents):
+
 2019-04-14  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp

@@ -119 +119 @@
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
-    ASSERT(m_inspectorAgent);
-    m_inspectorAgent->activateExtraDomains(m_agents.extraDomains());
+    ensureInspectorAgent().activateExtraDomains(m_agents.extraDomains());
 
     if (m_augmentingClient)
@@ -238 +237 @@
         m_pauseAfterInitialization = false;
 
-        ASSERT(m_debuggerAgent);
         ErrorString ignored;
-        m_debuggerAgent->enable(ignored);
-        m_debuggerAgent->pause(ignored);
+        ensureDebuggerAgent().enable(ignored);
+        ensureDebuggerAgent().pause(ignored);
     }
 
@@ -275 +273 @@
     m_agents.appendExtraAgent(WTFMove(agent));
 
-    ASSERT(m_inspectorAgent);
-    m_inspectorAgent->activateExtraDomain(domainName);
-}
-#endif
+    ensureInspectorAgent().activateExtraDomain(domainName);
+}
+#endif
+
+InspectorAgent& JSGlobalObjectInspectorController::ensureInspectorAgent()
+{
+    if (!m_inspectorAgent) {
+        auto context = jsAgentContext();
+        auto inspectorAgent = std::make_unique<InspectorAgent>(context);
+        m_inspectorAgent = inspectorAgent.get();
+        m_agents.append(WTFMove(inspectorAgent));
+    }
+    return *m_inspectorAgent;
+}
+
+InspectorDebuggerAgent& JSGlobalObjectInspectorController::ensureDebuggerAgent()
+{
+    if (!m_debuggerAgent) {
+        auto context = jsAgentContext();
+        auto debuggerAgent = std::make_unique<JSGlobalObjectDebuggerAgent>(context, m_consoleAgent);
+        m_debuggerAgent = debuggerAgent.get();
+        m_consoleClient->setInspectorDebuggerAgent(m_debuggerAgent);
+        m_agents.append(WTFMove(debuggerAgent));
+    }
+    return *m_debuggerAgent;
+}
 
 JSAgentContext JSGlobalObjectInspectorController::jsAgentContext()
@@ -306 +326 @@
     auto context = jsAgentContext();
 
-    auto inspectorAgent = std::make_unique<InspectorAgent>(context);
-    m_inspectorAgent = inspectorAgent.get();
-    m_agents.append(WTFMove(inspectorAgent));
+    ensureInspectorAgent();
 
     m_agents.append(std::make_unique<JSGlobalObjectRuntimeAgent>(context));
 
-    auto debuggerAgent = std::make_unique<JSGlobalObjectDebuggerAgent>(context, m_consoleAgent);
-    m_debuggerAgent = debuggerAgent.get();
-    m_consoleClient->setInspectorDebuggerAgent(m_debuggerAgent);
-    m_agents.append(WTFMove(debuggerAgent));
+    ensureDebuggerAgent();
 
     auto scriptProfilerAgentPtr = std::make_unique<InspectorScriptProfilerAgent>(context);

trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h

@@ -105 +105 @@
     void appendAPIBacktrace(ScriptCallStack&);
 
+    InspectorAgent& ensureInspectorAgent();
+    InspectorDebuggerAgent& ensureDebuggerAgent();
+
     JSAgentContext jsAgentContext();
     void createLazyAgents();
@@ -115 +118 @@
 
     AgentRegistry m_agents;
+    InspectorConsoleAgent* m_consoleAgent { nullptr };
+
+    // Lazy, but also on-demand agents.
     InspectorAgent* m_inspectorAgent { nullptr };
-    InspectorConsoleAgent* m_consoleAgent { nullptr };
     InspectorDebuggerAgent* m_debuggerAgent { nullptr };