Title: [295115] trunk/Source/WebKit/WebProcess/Plugins/PluginView.cpp
Revision
295115
Author
achristen...@apple.com
Date
2022-06-01 20:22:21 -0700 (Wed, 01 Jun 2022)

Log Message

Set PluginView::Stream::m_loader before calling NetscapePlugInStreamLoader::cancel
https://bugs.webkit.org/show_bug.cgi?id=241210

Reviewed by Chris Dumez.

* ../../Source/WebKit/WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::Stream::cancel):

Canonical link: https://commits.webkit.org/251206@main

Modified Paths

Diff

Modified: trunk/Source/WebKit/WebProcess/Plugins/PluginView.cpp (295114 => 295115)


--- trunk/Source/WebKit/WebProcess/Plugins/PluginView.cpp	2022-06-02 01:24:18 UTC (rev 295114)
+++ trunk/Source/WebKit/WebProcess/Plugins/PluginView.cpp	2022-06-02 03:22:21 UTC (rev 295115)
@@ -141,8 +141,9 @@
     ASSERT(m_loader);
 
     m_streamWasCancelled = true;
-    m_loader->cancel(m_loader->cancelledError());
-    m_loader = nullptr;
+
+    auto loader = std::exchange(m_loader, nullptr);
+    loader->cancel(loader->cancelledError());
 }
 
 void PluginView::Stream::continueLoad()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to