FrameLoader: Prevent reentrancy on dispatchDidClearWindowObjectInMainWorld.

Source/core/loader/FrameLoader.cpp

Index: Source/core/loader/FrameLoader.cpp
diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp
index df7b71458088ae0c1e25bcdf259046383eddf752..ed9202e376002b2b2ecdc8817d3d41fe9be911e5 100644
--- a/Source/core/loader/FrameLoader.cpp
+++ b/Source/core/loader/FrameLoader.cpp
@@ -1372,10 +1372,16 @@ void FrameLoader::dispatchDidClearDocumentOfWindowObject()
 
 void FrameLoader::dispatchDidClearWindowObjectInMainWorld()
 {
+    if (m_dispatchingDidClearWindowObjectInMainWorld)

[chrishtr, 2015/05/28 22:09:25]

I think you should do this instead:

if (m_dispatchingDidClearWindowObjectInMainWorld)
    return
m_dispatchingDidClearWindowObjectInMainWorld = true;

... dispatch

m_dispatchingDidClearWindowObjectInMainWorld = false;

[tommycli, 2015/05/28 22:19:36]

Done.

+        return;
+    m_dispatchingDidClearWindowObjectInMainWorld = true;
+
     if (!m_frame->script().canExecuteScripts(NotAboutToExecuteScript))
         return;
 
     client()->dispatchDidClearWindowObjectInMainWorld();
+
+    m_dispatchingDidClearWindowObjectInMainWorld = false;
 }
 
 SandboxFlags FrameLoader::effectiveSandboxFlags() const