<!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>[200839] releases/WebKitGTK/webkit-2.12/Source</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/200839">200839</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-13 04:36:41 -0700 (Fri, 13 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/200068">r200068</a> - Heap corruption is detected when destructing JSGlobalObject
https://bugs.webkit.org/show_bug.cgi?id=156831
Patch by Fujii Hironori <Hironori.Fujii@sony.com> on 2016-04-25
Reviewed by Mark Lam.
WebKit uses CRT static library on Windows. Each copy of the CRT
library has its own heap manager, allocating memory in one CRT
library and passing the pointer across a DLL boundary to be freed
by a different copy of the CRT library is a potential cause for
heap corruption.
Potential Errors Passing CRT Objects Across DLL Boundaries
<https://msdn.microsoft.com/en-us/library/ms235460(v=vs.140).aspx>
JSGlobalObject::createRareDataIfNeeded is inlined but
JSGlobalObject::~JSGlobalObject is not. Then, the heap of
allocating JSGlobalObjectRareData is WebKit.dll, but deallocating
JavaScriptCore.dll. Adding WTF_MAKE_FAST_ALLOCATED to
JSGlobalObjectRareData ensures heap consistency of it. WTF::Lock
also needs WTF_MAKE_FAST_ALLOCATED because it is allocated from
the inlined constructor of JSGlobalObjectRareData.
Source/JavaScriptCore:
Test: fast/dom/insertedIntoDocument-iframe.html
* runtime/JSGlobalObject.h:
Add WTF_MAKE_FAST_ALLOCATED to JSGlobalObjectRareData.
Source/WTF:
* wtf/Lock.h: Add WTF_MAKE_FAST_ALLOCATED.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceJavaScriptCoreruntimeJSGlobalObjecth">releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/JSGlobalObject.h</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWTFChangeLog">releases/WebKitGTK/webkit-2.12/Source/WTF/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWTFwtfLockh">releases/WebKitGTK/webkit-2.12/Source/WTF/wtf/Lock.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ChangeLog (200838 => 200839)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ChangeLog 2016-05-13 11:03:45 UTC (rev 200838)
+++ releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ChangeLog 2016-05-13 11:36:41 UTC (rev 200839)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-04-25 Fujii Hironori <Hironori.Fujii@sony.com>
+
+ Heap corruption is detected when destructing JSGlobalObject
+ https://bugs.webkit.org/show_bug.cgi?id=156831
+
+ Reviewed by Mark Lam.
+
+ WebKit uses CRT static library on Windows. Each copy of the CRT
+ library has its own heap manager, allocating memory in one CRT
+ library and passing the pointer across a DLL boundary to be freed
+ by a different copy of the CRT library is a potential cause for
+ heap corruption.
+
+ Potential Errors Passing CRT Objects Across DLL Boundaries
+ <https://msdn.microsoft.com/en-us/library/ms235460(v=vs.140).aspx>
+
+ JSGlobalObject::createRareDataIfNeeded is inlined but
+ JSGlobalObject::~JSGlobalObject is not. Then, the heap of
+ allocating JSGlobalObjectRareData is WebKit.dll, but deallocating
+ JavaScriptCore.dll. Adding WTF_MAKE_FAST_ALLOCATED to
+ JSGlobalObjectRareData ensures heap consistency of it. WTF::Lock
+ also needs WTF_MAKE_FAST_ALLOCATED because it is allocated from
+ the inlined constructor of JSGlobalObjectRareData.
+
+ Test: fast/dom/insertedIntoDocument-iframe.html
+
+ * runtime/JSGlobalObject.h:
+ Add WTF_MAKE_FAST_ALLOCATED to JSGlobalObjectRareData.
+
</ins><span class="cx"> 2016-04-27 Alberto Garcia <berto@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Fails to build randomly when generating LLIntDesiredOffsets.h
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceJavaScriptCoreruntimeJSGlobalObjecth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/JSGlobalObject.h (200838 => 200839)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/JSGlobalObject.h 2016-05-13 11:03:45 UTC (rev 200838)
+++ releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/JSGlobalObject.h 2016-05-13 11:36:41 UTC (rev 200839)
</span><span class="lines">@@ -181,6 +181,8 @@
</span><span class="cx"> typedef HashMap<OpaqueJSClass*, std::unique_ptr<OpaqueJSClassContextData>> OpaqueJSClassDataMap;
</span><span class="cx">
</span><span class="cx"> struct JSGlobalObjectRareData {
</span><ins>+ WTF_MAKE_FAST_ALLOCATED;
+ public:
</ins><span class="cx"> JSGlobalObjectRareData()
</span><span class="cx"> : profileGroup(0)
</span><span class="cx"> {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WTF/ChangeLog (200838 => 200839)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WTF/ChangeLog 2016-05-13 11:03:45 UTC (rev 200838)
+++ releases/WebKitGTK/webkit-2.12/Source/WTF/ChangeLog 2016-05-13 11:36:41 UTC (rev 200839)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-04-25 Fujii Hironori <Hironori.Fujii@sony.com>
+
+ Heap corruption is detected when destructing JSGlobalObject
+ https://bugs.webkit.org/show_bug.cgi?id=156831
+
+ Reviewed by Mark Lam.
+
+ WebKit uses CRT static library on Windows. Each copy of the CRT
+ library has its own heap manager, allocating memory in one CRT
+ library and passing the pointer across a DLL boundary to be freed
+ by a different copy of the CRT library is a potential cause for
+ heap corruption.
+
+ Potential Errors Passing CRT Objects Across DLL Boundaries
+ <https://msdn.microsoft.com/en-us/library/ms235460(v=vs.140).aspx>
+
+ JSGlobalObject::createRareDataIfNeeded is inlined but
+ JSGlobalObject::~JSGlobalObject is not. Then, the heap of
+ allocating JSGlobalObjectRareData is WebKit.dll, but deallocating
+ JavaScriptCore.dll. Adding WTF_MAKE_FAST_ALLOCATED to
+ JSGlobalObjectRareData ensures heap consistency of it. WTF::Lock
+ also needs WTF_MAKE_FAST_ALLOCATED because it is allocated from
+ the inlined constructor of JSGlobalObjectRareData.
+
+ * wtf/Lock.h: Add WTF_MAKE_FAST_ALLOCATED.
+
</ins><span class="cx"> 2016-04-05 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement operator== and operator!= for Optional<>
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWTFwtfLockh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WTF/wtf/Lock.h (200838 => 200839)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WTF/wtf/Lock.h 2016-05-13 11:03:45 UTC (rev 200838)
+++ releases/WebKitGTK/webkit-2.12/Source/WTF/wtf/Lock.h 2016-05-13 11:36:41 UTC (rev 200839)
</span><span class="lines">@@ -113,6 +113,7 @@
</span><span class="cx">
</span><span class="cx"> class Lock : public LockBase {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(Lock);
</span><ins>+ WTF_MAKE_FAST_ALLOCATED;
</ins><span class="cx"> public:
</span><span class="cx"> Lock()
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>