Invalidate process object before destruction

https://bugs.webkit.org/show_bug.cgi?id=265474 rdar://118721508 Reviewed by Brent Fulgham. The process object in ProcessLauncher should be invalidated before destroyed. * Source/WebKit/UIProcess/Launcher/ProcessLauncher.cpp: (WebKit::ProcessLauncher::~ProcessLauncher): * Source/WebKit/UIProcess/Launcher/ProcessLauncher.h: * Source/WebKit/UIProcess/Launcher/cocoa/ProcessLauncherCocoa.mm: (WebKit::ProcessLauncher::~ProcessLauncher): Canonical link: https://commits.webkit.org/271255@main
WebKit · Nov 29, 2023 · 6b158e3 · 6b158e3
1 parent 6aa1f67
commit 6b158e3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/Source/WebKit/UIProcess/Launcher/ProcessLauncher.cpp b/Source/WebKit/UIProcess/Launcher/ProcessLauncher.cpp
@@ -45,6 +45,12 @@ ProcessLauncher::ProcessLauncher(Client* client, LaunchOptions&& launchOptions)
     launchProcess();
 }
 
+#if !PLATFORM(COCOA)
+ProcessLauncher::~ProcessLauncher()
+{
+}
+#endif
+
 void ProcessLauncher::didFinishLaunchingProcess(ProcessID processIdentifier, IPC::Connection::Identifier identifier)
 {
     tracePoint(ProcessLaunchEnd);

diff --git a/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h b/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h
@@ -112,6 +112,8 @@ class ProcessLauncher : public ThreadSafeRefCountedAndCanMakeThreadSafeWeakPtr<P
         return adoptRef(*new ProcessLauncher(client, WTFMove(launchOptions)));
     }
 
+    virtual ~ProcessLauncher();
+
     bool isLaunching() const { return m_isLaunching; }
     ProcessID processID() const { return m_processID; }
 

diff --git a/Source/WebKit/UIProcess/Launcher/cocoa/ProcessLauncherCocoa.mm b/Source/WebKit/UIProcess/Launcher/cocoa/ProcessLauncherCocoa.mm
@@ -139,6 +139,13 @@ static void launchWithExtensionKit(ProcessLauncher& processLauncher, ProcessLaun
     }
 }
 
+ProcessLauncher::~ProcessLauncher()
+{
+#if USE(EXTENSIONKIT)
+    [m_process invalidate];
+#endif
+}
+
 void ProcessLauncher::launchProcess()
 {
     ASSERT(!m_xpcConnection);