<!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>[198530] trunk</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/198530">198530</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2016-03-22 09:02:22 -0700 (Tue, 22 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>
Source/WebCore:
SharedBuffer::copy() can cause a segmentation fault.
https://bugs.webkit.org/show_bug.cgi?id=155739
Reviewed by Ryosuke Niwa.
Based on a Blink patch by Huang Dongsung <luxtella@company100.net>.
<https://src.chromium.org/viewvc/blink?revision=153850&view=revision>
After SharedBuffer::copy(), SharedBuffer::append() can cause segmentation fault,
because copy() calls clone->m_buffer.append(m_segments[i], segmentSize) even if
'i' is the last index. The data size of m_segments.last() is often less than
segmentSize. So, in the cloned instance m_size < (m_buffer.size() + SUM(m_segments[i].size())).
This patch appends the exact size of the last segment instead of segmentSize.
Tested by TestWebKitAPI SharedBufferTest::copy
* platform/SharedBuffer.cpp:
(SharedBuffer::copy):
Tools:
[Win] SharedBuffer::copy() can cause a segmentation fault.
https://bugs.webkit.org/show_bug.cgi?id=155739
Reviewed by Ryosuke Niwa.
* TestWebKitAPI/PlatformWin.cmake: Build and run the
SharedBuffer tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformSharedBuffercpp">trunk/Source/WebCore/platform/SharedBuffer.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPIPlatformWincmake">trunk/Tools/TestWebKitAPI/PlatformWin.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198529 => 198530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-22 15:29:15 UTC (rev 198529)
+++ trunk/Source/WebCore/ChangeLog 2016-03-22 16:02:22 UTC (rev 198530)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-03-22 Brent Fulgham <bfulgham@apple.com>
+
+ SharedBuffer::copy() can cause a segmentation fault.
+ https://bugs.webkit.org/show_bug.cgi?id=155739
+
+ Reviewed by Ryosuke Niwa.
+
+ Based on a Blink patch by Huang Dongsung <luxtella@company100.net>.
+ <https://src.chromium.org/viewvc/blink?revision=153850&view=revision>
+
+ After SharedBuffer::copy(), SharedBuffer::append() can cause segmentation fault,
+ because copy() calls clone->m_buffer.append(m_segments[i], segmentSize) even if
+ 'i' is the last index. The data size of m_segments.last() is often less than
+ segmentSize. So, in the cloned instance m_size < (m_buffer.size() + SUM(m_segments[i].size())).
+ This patch appends the exact size of the last segment instead of segmentSize.
+
+ Tested by TestWebKitAPI SharedBufferTest::copy
+
+ * platform/SharedBuffer.cpp:
+ (SharedBuffer::copy):
+
</ins><span class="cx"> 2016-03-22 Alberto Garcia <berto@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed typo fix.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSharedBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SharedBuffer.cpp (198529 => 198530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SharedBuffer.cpp 2016-03-22 15:29:15 UTC (rev 198529)
+++ trunk/Source/WebCore/platform/SharedBuffer.cpp 2016-03-22 16:02:22 UTC (rev 198530)
</span><span class="lines">@@ -264,8 +264,14 @@
</span><span class="cx"> clone->m_buffer->data.append(m_buffer->data.data(), m_buffer->data.size());
</span><span class="cx">
</span><span class="cx"> #if !USE(NETWORK_CFDATA_ARRAY_CALLBACK)
</span><del>- for (char* segment : m_segments)
- clone->m_buffer->data.append(segment, segmentSize);
</del><ins>+ if (!m_segments.isEmpty()) {
+ unsigned lastIndex = m_segments.size() - 1;
+ for (unsigned i = 0; i < lastIndex; ++i)
+ clone->m_buffer->data.append(m_segments[i], segmentSize);
+
+ unsigned sizeOfLastSegment = m_size - m_buffer->data.size() - lastIndex * segmentSize;
+ clone->m_buffer->data.append(m_segments.last(), sizeOfLastSegment);
+ }
</ins><span class="cx"> #else
</span><span class="cx"> for (auto& data : m_dataArray)
</span><span class="cx"> clone->m_dataArray.append(data.get());
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (198529 => 198530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-03-22 15:29:15 UTC (rev 198529)
+++ trunk/Tools/ChangeLog 2016-03-22 16:02:22 UTC (rev 198530)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-03-21 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] SharedBuffer::copy() can cause a segmentation fault.
+ https://bugs.webkit.org/show_bug.cgi?id=155739
+
+ Reviewed by Ryosuke Niwa.
+
+ * TestWebKitAPI/PlatformWin.cmake: Build and run the
+ SharedBuffer tests.
+
</ins><span class="cx"> 2016-03-22 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [buildbot] Move ARM Linux bots to JSCOnly port
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformWin.cmake (198529 => 198530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2016-03-22 15:29:15 UTC (rev 198529)
+++ trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2016-03-22 16:02:22 UTC (rev 198530)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> include_directories(
</span><span class="cx"> ${DERIVED_SOURCES_DIR}
</span><span class="cx"> ${DERIVED_SOURCES_DIR}/ForwardingHeaders
</span><ins>+ ${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore
</ins><span class="cx"> ${TESTWEBKITAPI_DIR}/win
</span><span class="cx"> ${DERIVED_SOURCES_DIR}/WebKit/Interfaces
</span><span class="cx"> )
</span><span class="lines">@@ -43,6 +44,7 @@
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WebCore/HTMLParserIdioms.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WebCore/LayoutUnit.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WebCore/ParsedContentRange.cpp
</span><ins>+ ${TESTWEBKITAPI_DIR}/Tests/WebCore/SharedBuffer.cpp
</ins><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WebCore/TimeRanges.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WebCore/URL.cpp
</span><span class="cx"> )
</span></span></pre>
</div>
</div>
</body>
</html>