<!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>[179707] trunk/Source/WebKit2</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/179707">179707</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-02-05 14:13:10 -0800 (Thu, 05 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Properly check for mmap() error case
https://bugs.webkit.org/show_bug.cgi?id=141304
Reviewed by Anders Carlsson.
mmap() returns MAP_FAILED, which is (void*)-1, not a null pointer in
case of failure. This patch updates several wrong error checks in
WebKit2.
* Platform/IPC/ArgumentEncoder.cpp:
(IPC::allocBuffer):
(IPC::ArgumentEncoder::reserve):
* Platform/IPC/mac/ConnectionMac.mm:
(IPC::Connection::sendOutgoingMessage):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCArgumentEncodercpp">trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCmacConnectionMacmm">trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (179706 => 179707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-02-05 21:55:45 UTC (rev 179706)
+++ trunk/Source/WebKit2/ChangeLog 2015-02-05 22:13:10 UTC (rev 179707)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-02-05 Chris Dumez <cdumez@apple.com>
+
+ [WK2] Properly check for mmap() error case
+ https://bugs.webkit.org/show_bug.cgi?id=141304
+
+ Reviewed by Anders Carlsson.
+
+ mmap() returns MAP_FAILED, which is (void*)-1, not a null pointer in
+ case of failure. This patch updates several wrong error checks in
+ WebKit2.
+
+ * Platform/IPC/ArgumentEncoder.cpp:
+ (IPC::allocBuffer):
+ (IPC::ArgumentEncoder::reserve):
+ * Platform/IPC/mac/ConnectionMac.mm:
+ (IPC::Connection::sendOutgoingMessage):
+
</ins><span class="cx"> 2015-02-05 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Clean up WebInspectorProxy and use simpler inspector levels design
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCArgumentEncodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.cpp (179706 => 179707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.cpp 2015-02-05 21:55:45 UTC (rev 179706)
+++ trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.cpp 2015-02-05 22:13:10 UTC (rev 179707)
</span><span class="lines">@@ -36,12 +36,15 @@
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx">
</span><del>-static inline void* allocBuffer(size_t size)
</del><ins>+template <typename T>
+static inline bool allocBuffer(T*& buffer, size_t size)
</ins><span class="cx"> {
</span><span class="cx"> #if OS(DARWIN)
</span><del>- return mmap(0, size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0);
</del><ins>+ buffer = static_cast<T*>(mmap(0, size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0));
+ return buffer != MAP_FAILED;
</ins><span class="cx"> #else
</span><del>- return fastMalloc(size);
</del><ins>+ buffer = static_cast<T*>(fastMalloc(size));
+ return !!buffer;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -90,8 +93,8 @@
</span><span class="cx"> while (newCapacity < size)
</span><span class="cx"> newCapacity *= 2;
</span><span class="cx">
</span><del>- uint8_t* newBuffer = static_cast<uint8_t*>(allocBuffer(newCapacity));
- if (!newBuffer)
</del><ins>+ uint8_t* newBuffer;
+ if (!allocBuffer(newBuffer, newCapacity))
</ins><span class="cx"> CRASH();
</span><span class="cx">
</span><span class="cx"> memcpy(newBuffer, m_buffer, m_bufferSize);
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCmacConnectionMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm (179706 => 179707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2015-02-05 21:55:45 UTC (rev 179706)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2015-02-05 22:13:10 UTC (rev 179707)
</span><span class="lines">@@ -283,8 +283,11 @@
</span><span class="cx">
</span><span class="cx"> char stackBuffer[inlineMessageMaxSize];
</span><span class="cx"> char* buffer = &stackBuffer[0];
</span><del>- if (messageSize > inlineMessageMaxSize)
</del><ins>+ if (messageSize > inlineMessageMaxSize) {
</ins><span class="cx"> buffer = (char*)mmap(0, messageSize, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0);
</span><ins>+ if (buffer == MAP_FAILED)
+ return false;
+ }
</ins><span class="cx">
</span><span class="cx"> bool isComplex = (numberOfPortDescriptors + numberOfOOLMemoryDescriptors > 0);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>