<!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>[179915] trunk/Source/WTF</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/179915">179915</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2015-02-10 20:54:03 -0800 (Tue, 10 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add the crash-on-failure behavior to bmalloc-based fastMalloc
https://bugs.webkit.org/show_bug.cgi?id=141434
Reviewed by Alexey Proskuryakov.
* wtf/FastMalloc.cpp: Removed unneeded includes.
(WTF::fastMalloc): Added null check and CRASH.
(WTF::fastCalloc): Added overflow checking, null check, and CRASH.
(WTF::fastRealloc): Added null check and CRASH.
(WTF::fastMallocSize): Added FIXME comment.
(WTF::fastMallocGoodSize): Added FIXME comment.
(WTF::fastAlignedMalloc): Added null check and CRASH.
(WTF::tryFastMalloc): Changed to call bmalloc directly instead of
calling fastMalloc, since fastMalloc will now crash on failure.
(WTF::tryFastRealloc): Changed to call bmalloc directly instead of
calling fastRealloc, since fastRealloc will now crash on failure.
(WTF::tryFastCalloc): Added overflow checking.
(WTF::fastMallocStatistics): Added FIXME comment.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFastMalloccpp">trunk/Source/WTF/wtf/FastMalloc.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (179914 => 179915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-02-11 04:01:43 UTC (rev 179914)
+++ trunk/Source/WTF/ChangeLog 2015-02-11 04:54:03 UTC (rev 179915)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-02-10 Darin Adler <darin@apple.com>
+
+ Add the crash-on-failure behavior to bmalloc-based fastMalloc
+ https://bugs.webkit.org/show_bug.cgi?id=141434
+
+ Reviewed by Alexey Proskuryakov.
+
+ * wtf/FastMalloc.cpp: Removed unneeded includes.
+ (WTF::fastMalloc): Added null check and CRASH.
+ (WTF::fastCalloc): Added overflow checking, null check, and CRASH.
+ (WTF::fastRealloc): Added null check and CRASH.
+ (WTF::fastMallocSize): Added FIXME comment.
+ (WTF::fastMallocGoodSize): Added FIXME comment.
+ (WTF::fastAlignedMalloc): Added null check and CRASH.
+ (WTF::tryFastMalloc): Changed to call bmalloc directly instead of
+ calling fastMalloc, since fastMalloc will now crash on failure.
+ (WTF::tryFastRealloc): Changed to call bmalloc directly instead of
+ calling fastRealloc, since fastRealloc will now crash on failure.
+ (WTF::tryFastCalloc): Added overflow checking.
+ (WTF::fastMallocStatistics): Added FIXME comment.
+
</ins><span class="cx"> 2015-02-10 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] GMutexLocker build issue
</span></span></pre></div>
<a id="trunkSourceWTFwtfFastMalloccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FastMalloc.cpp (179914 => 179915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FastMalloc.cpp 2015-02-11 04:01:43 UTC (rev 179914)
+++ trunk/Source/WTF/wtf/FastMalloc.cpp 2015-02-11 04:54:03 UTC (rev 179915)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> // Copyright (c) 2005, 2007, Google Inc.
</span><span class="cx"> // All rights reserved.
</span><del>-// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2011, 2015 Apple Inc. All rights reserved.
</del><ins>+// Copyright (C) 2005-2009, 2011, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> //
</span><span class="cx"> // Redistribution and use in source and binary forms, with or without
</span><span class="cx"> // modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -77,18 +77,17 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "FastMalloc.h"
</span><span class="cx">
</span><del>-#include "Assertions.h"
</del><ins>+#include "CheckedArithmetic.h"
</ins><span class="cx"> #include "CurrentTime.h"
</span><ins>+#include <limits>
+#include <string.h>
+#include <wtf/DataLog.h>
</ins><span class="cx">
</span><del>-#include <limits>
</del><span class="cx"> #if OS(WINDOWS)
</span><span class="cx"> #include <windows.h>
</span><span class="cx"> #else
</span><span class="cx"> #include <pthread.h>
</span><span class="cx"> #endif
</span><del>-#include <string.h>
-#include <wtf/DataLog.h>
-#include <wtf/StdLibExtras.h>
</del><span class="cx">
</span><span class="cx"> #if OS(DARWIN)
</span><span class="cx"> #include <mach/mach_init.h>
</span><span class="lines">@@ -273,37 +272,55 @@
</span><span class="cx">
</span><span class="cx"> void* fastMalloc(size_t size)
</span><span class="cx"> {
</span><del>- return bmalloc::api::malloc(size);
</del><ins>+ void* result = bmalloc::api::malloc(size);
+ if (!result)
+ CRASH();
+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void* fastCalloc(size_t numElements, size_t elementSize)
</span><span class="cx"> {
</span><del>- return fastZeroedMalloc(numElements * elementSize);
</del><ins>+ Checked<size_t> checkedSize = elementSize;
+ checkedSize *= numElements;
+ void* result = fastZeroedMalloc(checkedSize.unsafeGet());
+ if (!result)
+ CRASH();
+ return result;
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> void* fastRealloc(void* object, size_t size)
</span><span class="cx"> {
</span><del>- return bmalloc::api::realloc(object, size);
</del><ins>+ void* result = bmalloc::api::realloc(object, size);
+ if (!result)
+ CRASH();
+ return result;
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> void fastFree(void* object)
</span><span class="cx"> {
</span><span class="cx"> bmalloc::api::free(object);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> size_t fastMallocSize(const void*)
</span><span class="cx"> {
</span><ins>+ // FIXME: This is incorrect; best fix is probably to remove this function.
+ // Caller currently are all using this for assertion, not to actually check
+ // the size of the allocation, so maybe we can come up with something for that.
</ins><span class="cx"> return 1;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> size_t fastMallocGoodSize(size_t size)
</span><span class="cx"> {
</span><ins>+ // FIXME: This is non-helpful; fastMallocGoodSize will be removed soon.
</ins><span class="cx"> return size;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> void* fastAlignedMalloc(size_t alignment, size_t size)
</span><span class="cx"> {
</span><del>- return bmalloc::api::memalign(alignment, size);
</del><ins>+ void* result = bmalloc::api::memalign(alignment, size);
+ if (!result)
+ CRASH();
+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void fastAlignedFree(void* p)
</span><span class="lines">@@ -313,17 +330,21 @@
</span><span class="cx">
</span><span class="cx"> TryMallocReturnValue tryFastMalloc(size_t size)
</span><span class="cx"> {
</span><del>- return fastMalloc(size);
</del><ins>+ return bmalloc::api::malloc(size);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-TryMallocReturnValue tryFastRealloc(void* p, size_t n)
</del><ins>+TryMallocReturnValue tryFastRealloc(void* object, size_t size)
</ins><span class="cx"> {
</span><del>- return fastRealloc(p, n);
</del><ins>+ return bmalloc::api::realloc(object, size);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TryMallocReturnValue tryFastCalloc(size_t numElements, size_t elementSize)
</span><span class="cx"> {
</span><del>- return tryFastZeroedMalloc(numElements * elementSize);
</del><ins>+ Checked<size_t, RecordOverflow> checkedSize = elementSize;
+ checkedSize *= numElements;
+ if (checkedSize.hasOverflowed())
+ return nullptr;
+ return tryFastZeroedMalloc(checkedSize.unsafeGet());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void releaseFastMallocFreeMemoryForThisThread()
</span><span class="lines">@@ -338,6 +359,7 @@
</span><span class="cx">
</span><span class="cx"> FastMallocStatistics fastMallocStatistics()
</span><span class="cx"> {
</span><ins>+ // FIXME: This is incorrect; needs an implementation or to be removed.
</ins><span class="cx"> FastMallocStatistics statistics = { 0, 0, 0 };
</span><span class="cx"> return statistics;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>