Title: [292002] trunk/Source/WebCore
- Revision
- 292002
- Author
- commit-qu...@webkit.org
- Date
- 2022-03-28 15:52:49 -0700 (Mon, 28 Mar 2022)
Log Message
Check for re-entrancy in stopForBackForwardCache
https://bugs.webkit.org/show_bug.cgi?id=223536
Patch by Rob Buis <rb...@igalia.com> on 2022-03-28
Reviewed by Darin Adler.
Check for re-entrancy in stopForBackForwardCache.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::stopForBackForwardCache):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (292001 => 292002)
--- trunk/Source/WebCore/ChangeLog 2022-03-28 22:51:41 UTC (rev 292001)
+++ trunk/Source/WebCore/ChangeLog 2022-03-28 22:52:49 UTC (rev 292002)
@@ -1,3 +1,15 @@
+2022-03-28 Rob Buis <rb...@igalia.com>
+
+ Check for re-entrancy in stopForBackForwardCache
+ https://bugs.webkit.org/show_bug.cgi?id=223536
+
+ Reviewed by Darin Adler.
+
+ Check for re-entrancy in stopForBackForwardCache.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::stopForBackForwardCache):
+
2022-03-28 Cameron McCormack <hey...@apple.com>
Remove the 1ms minimum for setTimeout
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (292001 => 292002)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2022-03-28 22:51:41 UTC (rev 292001)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2022-03-28 22:52:49 UTC (rev 292002)
@@ -1830,7 +1830,8 @@
void FrameLoader::stopForBackForwardCache()
{
- m_inStopForBackForwardCache = true;
+ ASSERT(!m_inStopForBackForwardCache);
+ SetForScope<bool> inStopForBackForwardCache { m_inStopForBackForwardCache, true };
// Stop provisional loads in subframes (The one in the main frame is about to be committed).
if (!m_frame.isMainFrame()) {
if (m_provisionalDocumentLoader)
@@ -1850,7 +1851,6 @@
// running script, which could schedule new navigations.
policyChecker().stopCheck();
m_frame.navigationScheduler().cancel();
- m_inStopForBackForwardCache = false;
}
void FrameLoader::stopAllLoadersAndCheckCompleteness()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
