FrameLoader: Prevent reentrancy on dispatchDidClearWindowObjectInMainWorld.

Source/core/loader/FrameLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ skipping 1354 matching lines @@
 
     InspectorInstrumentation::didClearDocumentOfWindowObject(m_frame);
 
     // We just cleared the document, not the entire window object, but for the
     // embedder that's close enough.
     client()->dispatchDidClearWindowObjectInMainWorld();
 }
 
 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
 {
     SandboxFlags flags = m_forcedSandboxFlags;
     if (FrameOwner* frameOwner = m_frame->owner())
         flags |= frameOwner->sandboxFlags();
     // Frames need to inherit the sandbox flags of their parent frame.
     if (Frame* parentFrame = m_frame->tree().parent())
         flags |= parentFrame->securityContext()->sandboxFlags();
@@ skipping 40 matching lines @@
     // FIXME: We need a way to propagate insecure requests policy flags to
     // out-of-process frames. For now, we'll always use default behavior.
     if (!parentFrame->isLocalFrame())
         return nullptr;
 
     ASSERT(toLocalFrame(parentFrame)->document());
     return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade();
 }
 
 } // namespace blink