<!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>[195034] releases/WebKitGTK/webkit-2.10/Source/WebCore</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/195034">195034</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-14 04:03:48 -0800 (Thu, 14 Jan 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/192582">r192582</a> - Null dereference in Performance::Performance(WebCore::Frame*)
https://bugs.webkit.org/show_bug.cgi?id=151390

Reviewed by Brady Eidson.

Based on the stack trace, it appears the DocumentLoader can be null
when constructing the Performance object. This patch thus adds a null
check before trying to dereference it.

No new tests, was not able to reproduce.

* page/DOMWindow.cpp:
(WebCore::DOMWindow::navigator):
(WebCore::DOMWindow::performance):
* page/Performance.cpp:
(WebCore::Performance::Performance):
(WebCore::Performance::scriptExecutionContext):
* page/Performance.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorepageDOMWindowcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorepagePerformancecpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/page/Performance.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorepagePerformanceh">releases/WebKitGTK/webkit-2.10/Source/WebCore/page/Performance.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (195033 => 195034)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog        2016-01-14 12:02:23 UTC (rev 195033)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog        2016-01-14 12:03:48 UTC (rev 195034)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-11-18  Chris Dumez  &lt;cdumez@apple.com&gt;
+
+        Null dereference in Performance::Performance(WebCore::Frame*)
+        https://bugs.webkit.org/show_bug.cgi?id=151390
+
+        Reviewed by Brady Eidson.
+
+        Based on the stack trace, it appears the DocumentLoader can be null
+        when constructing the Performance object. This patch thus adds a null
+        check before trying to dereference it.
+
+        No new tests, was not able to reproduce.
+
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::navigator):
+        (WebCore::DOMWindow::performance):
+        * page/Performance.cpp:
+        (WebCore::Performance::Performance):
+        (WebCore::Performance::scriptExecutionContext):
+        * page/Performance.h:
+
</ins><span class="cx"> 2015-11-18  Alejandro G. Castro  &lt;alex@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Cairo] SolidStroke broken in drawLine after r191658
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/page/DOMWindow.cpp (195033 => 195034)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/page/DOMWindow.cpp        2016-01-14 12:02:23 UTC (rev 195033)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/page/DOMWindow.cpp        2016-01-14 12:03:48 UTC (rev 195034)
</span><span class="lines">@@ -724,7 +724,7 @@
</span><span class="cx"> Navigator* DOMWindow::navigator() const
</span><span class="cx"> {
</span><span class="cx">     if (!isCurrentlyDisplayedInFrame())
</span><del>-        return 0;
</del><ins>+        return nullptr;
</ins><span class="cx">     if (!m_navigator)
</span><span class="cx">         m_navigator = Navigator::create(m_frame);
</span><span class="cx">     return m_navigator.get();
</span><span class="lines">@@ -734,9 +734,9 @@
</span><span class="cx"> Performance* DOMWindow::performance() const
</span><span class="cx"> {
</span><span class="cx">     if (!isCurrentlyDisplayedInFrame())
</span><del>-        return 0;
</del><ins>+        return nullptr;
</ins><span class="cx">     if (!m_performance)
</span><del>-        m_performance = Performance::create(m_frame);
</del><ins>+        m_performance = Performance::create(*m_frame);
</ins><span class="cx">     return m_performance.get();
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorepagePerformancecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/page/Performance.cpp (195033 => 195034)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/page/Performance.cpp        2016-01-14 12:02:23 UTC (rev 195033)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/page/Performance.cpp        2016-01-14 12:03:48 UTC (rev 195034)
</span><span class="lines">@@ -30,10 +30,13 @@
</span><span class="cx">  */
</span><span class="cx"> 
</span><span class="cx"> #include &quot;config.h&quot;
</span><ins>+
+#if ENABLE(WEB_TIMING)
</ins><span class="cx"> #include &quot;Performance.h&quot;
</span><span class="cx"> 
</span><span class="cx"> #include &quot;Document.h&quot;
</span><span class="cx"> #include &quot;DocumentLoader.h&quot;
</span><ins>+#include &quot;Frame.h&quot;
</ins><span class="cx"> #include &quot;PerformanceEntry.h&quot;
</span><span class="cx"> #include &quot;PerformanceNavigation.h&quot;
</span><span class="cx"> #include &quot;PerformanceResourceTiming.h&quot;
</span><span class="lines">@@ -42,22 +45,18 @@
</span><span class="cx"> #include &quot;ResourceResponse.h&quot;
</span><span class="cx"> #include &lt;wtf/CurrentTime.h&gt;
</span><span class="cx"> 
</span><del>-#if ENABLE(WEB_TIMING)
-
-#include &quot;Frame.h&quot;
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(RESOURCE_TIMING)
</span><span class="cx"> static const size_t defaultResourceTimingBufferSize = 150;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-Performance::Performance(Frame* frame)
-    : DOMWindowProperty(frame)
</del><ins>+Performance::Performance(Frame&amp; frame)
+    : DOMWindowProperty(&amp;frame)
</ins><span class="cx"> #if ENABLE(RESOURCE_TIMING)
</span><span class="cx">     , m_resourceTimingBufferSize(defaultResourceTimingBufferSize)
</span><span class="cx"> #endif // ENABLE(RESOURCE_TIMING)
</span><del>-    , m_referenceTime(frame-&gt;document()-&gt;loader()-&gt;timing().referenceMonotonicTime())
</del><ins>+    , m_referenceTime(frame.document()-&gt;loader() ? frame.document()-&gt;loader()-&gt;timing().referenceMonotonicTime() : monotonicallyIncreasingTime())
</ins><span class="cx"> #if ENABLE(USER_TIMING)
</span><span class="cx">     , m_userTiming(nullptr)
</span><span class="cx"> #endif // ENABLE(USER_TIMING)
</span><span class="lines">@@ -72,7 +71,7 @@
</span><span class="cx"> ScriptExecutionContext* Performance::scriptExecutionContext() const
</span><span class="cx"> {
</span><span class="cx">     if (!frame())
</span><del>-        return 0;
</del><ins>+        return nullptr;
</ins><span class="cx">     return frame()-&gt;document();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -231,7 +230,7 @@
</span><span class="cx"> 
</span><span class="cx"> double Performance::now() const
</span><span class="cx"> {
</span><del>-    double nowSeconds = WTF::monotonicallyIncreasingTime() - m_referenceTime;
</del><ins>+    double nowSeconds = monotonicallyIncreasingTime() - m_referenceTime;
</ins><span class="cx">     const double resolutionSeconds = 0.000005;
</span><span class="cx">     return 1000.0 * floor(nowSeconds / resolutionSeconds) * resolutionSeconds;
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorepagePerformanceh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/page/Performance.h (195033 => 195034)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/page/Performance.h        2016-01-14 12:02:23 UTC (rev 195033)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/page/Performance.h        2016-01-14 12:03:48 UTC (rev 195034)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> 
</span><span class="cx"> class Performance final : public ScriptWrappable, public RefCounted&lt;Performance&gt;, public DOMWindowProperty, public EventTargetWithInlineData {
</span><span class="cx"> public:
</span><del>-    static Ref&lt;Performance&gt; create(Frame* frame) { return adoptRef(*new Performance(frame)); }
</del><ins>+    static Ref&lt;Performance&gt; create(Frame&amp; frame) { return adoptRef(*new Performance(frame)); }
</ins><span class="cx">     ~Performance();
</span><span class="cx"> 
</span><span class="cx">     virtual EventTargetInterface eventTargetInterface() const override { return PerformanceEventTargetInterfaceType; }
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> #endif // ENABLE(USER_TIMING)
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    explicit Performance(Frame*);
</del><ins>+    explicit Performance(Frame&amp;);
</ins><span class="cx"> 
</span><span class="cx">     virtual void refEventTarget() override { ref(); }
</span><span class="cx">     virtual void derefEventTarget() override { deref(); }
</span></span></pre>
</div>
</div>

</body>
</html>