<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[175897] releases/WebKitGTK/webkit-2.6</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/175897">175897</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-11 03:40:42 -0800 (Tue, 11 Nov 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/174922">r174922</a> - Ensure attached frame count doesn't exceed the maximum allowed frames
https://bugs.webkit.org/show_bug.cgi?id=136457

Reviewed by Alexey Proskuryakov.

Source/WebCore:

Test: fast/frames/exponential-frames.html

* html/HTMLFrameElementBase.cpp:
(WebCore::HTMLFrameElementBase::isURLAllowed):

LayoutTests:

* fast/frames/exponential-frames-expected.txt: Added.
* fast/frames/exponential-frames.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorehtmlHTMLFrameElementBasecpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/html/HTMLFrameElementBase.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsfastframesexponentialframesexpectedtxt">releases/WebKitGTK/webkit-2.6/LayoutTests/fast/frames/exponential-frames-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsfastframesexponentialframeshtml">releases/WebKitGTK/webkit-2.6/LayoutTests/fast/frames/exponential-frames.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog (175896 => 175897)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog        2014-11-11 11:39:26 UTC (rev 175896)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog        2014-11-11 11:40:42 UTC (rev 175897)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-10-17  Jeffrey Pfau  &lt;jpfau@apple.com&gt;
+
+        Ensure attached frame count doesn't exceed the maximum allowed frames
+        https://bugs.webkit.org/show_bug.cgi?id=136457
+
+        Reviewed by Alexey Proskuryakov.
+
+        * fast/frames/exponential-frames-expected.txt: Added.
+        * fast/frames/exponential-frames.html: Added.
+
</ins><span class="cx"> 2014-10-20  Youenn Fablet  &lt;youenn.fablet@crf.canon.fr&gt;
</span><span class="cx"> 
</span><span class="cx">         Tighten XMLHttpRequest setRequestHeader value check
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsfastframesexponentialframesexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/fast/frames/exponential-frames-expected.txt (0 => 175897)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/fast/frames/exponential-frames-expected.txt                                (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/fast/frames/exponential-frames-expected.txt        2014-11-11 11:40:42 UTC (rev 175897)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+This test passes if it does not crash.
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsfastframesexponentialframeshtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/fast/frames/exponential-frames.html (0 => 175897)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/fast/frames/exponential-frames.html                                (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/fast/frames/exponential-frames.html        2014-11-11 11:40:42 UTC (rev 175897)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+&lt;html&gt;
+&lt;head&gt;
+&lt;script&gt;
+if (window.testRunner)
+    testRunner.dumpAsText();
+&lt;/script&gt;
+&lt;body&gt;
+This test passes if it does not crash.
+&lt;script&gt;
+var elem = document.body;
+var frame = document.createElement(&quot;iframe&quot;);
+frame.setAttribute(&quot;id&quot;, &quot;frame&quot;);
+document.body.appendChild(frame);
+var div = document.createElement(&quot;div&quot;);
+div.setAttribute(&quot;id&quot;, &quot;div&quot;);
+frame.appendChild(div);
+for (var i = 0; i &lt; 10; i++) {
+    var div = document.getElementById(&quot;div&quot;);
+    var clone = elem.parentElement.cloneNode(true);
+    div.appendChild(clone);
+}
+frame.parentElement.removeChild(frame);
+&lt;/script&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (175896 => 175897)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog        2014-11-11 11:39:26 UTC (rev 175896)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog        2014-11-11 11:40:42 UTC (rev 175897)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-10-17  Jeffrey Pfau  &lt;jpfau@apple.com&gt;
+
+        Ensure attached frame count doesn't exceed the maximum allowed frames
+        https://bugs.webkit.org/show_bug.cgi?id=136457
+
+        Reviewed by Alexey Proskuryakov.
+
+        Test: fast/frames/exponential-frames.html
+
+        * html/HTMLFrameElementBase.cpp:
+        (WebCore::HTMLFrameElementBase::isURLAllowed):
+
</ins><span class="cx"> 2014-10-20  Youenn Fablet  &lt;youenn.fablet@crf.canon.fr&gt;
</span><span class="cx"> 
</span><span class="cx">         Tighten XMLHttpRequest setRequestHeader value check
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorehtmlHTMLFrameElementBasecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/html/HTMLFrameElementBase.cpp (175896 => 175897)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/html/HTMLFrameElementBase.cpp        2014-11-11 11:39:26 UTC (rev 175896)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/html/HTMLFrameElementBase.cpp        2014-11-11 11:40:42 UTC (rev 175897)
</span><span class="lines">@@ -55,6 +55,9 @@
</span><span class="cx"> 
</span><span class="cx"> bool HTMLFrameElementBase::isURLAllowed() const
</span><span class="cx"> {
</span><ins>+    if (document().page() &amp;&amp; document().page()-&gt;subframeCount() &gt;= Page::maxNumberOfFrames)
+        return false;
+
</ins><span class="cx">     if (m_URL.isEmpty())
</span><span class="cx">         return true;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>