Title: [197771] trunk/Source/WebCore
- Revision
- 197771
- Author
- bfulg...@apple.com
- Date
- 2016-03-08 09:39:52 -0800 (Tue, 08 Mar 2016)
Log Message
Unreviewed test fix after r197721.
https://bugs.webkit.org/show_bug.cgi?id=155120
<rdar://problem/25010167>
If a WK1 client turns on the "Resource Load Statistics" debug flag, but
does not supply a data modification handler, we dereference a null function.
* loader/ResourceLoadStatisticsStore.cpp:
(WebCore::ResourceLoadStatisticsStore::fireDataModificationHandler): Check
for nullptr function before invoking it.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (197770 => 197771)
--- trunk/Source/WebCore/ChangeLog 2016-03-08 17:25:33 UTC (rev 197770)
+++ trunk/Source/WebCore/ChangeLog 2016-03-08 17:39:52 UTC (rev 197771)
@@ -1,3 +1,16 @@
+2016-03-08 Brent Fulgham <bfulg...@apple.com>
+
+ Unreviewed test fix after r197721.
+ https://bugs.webkit.org/show_bug.cgi?id=155120
+ <rdar://problem/25010167>
+
+ If a WK1 client turns on the "Resource Load Statistics" debug flag, but
+ does not supply a data modification handler, we dereference a null function.
+
+ * loader/ResourceLoadStatisticsStore.cpp:
+ (WebCore::ResourceLoadStatisticsStore::fireDataModificationHandler): Check
+ for nullptr function before invoking it.
+
2016-03-08 Chris Dumez <cdu...@apple.com>
Unreviewed, temporarily comment out static_assert while I investigate.
Modified: trunk/Source/WebCore/loader/ResourceLoadStatisticsStore.cpp (197770 => 197771)
--- trunk/Source/WebCore/loader/ResourceLoadStatisticsStore.cpp 2016-03-08 17:25:33 UTC (rev 197770)
+++ trunk/Source/WebCore/loader/ResourceLoadStatisticsStore.cpp 2016-03-08 17:39:52 UTC (rev 197771)
@@ -133,7 +133,8 @@
void ResourceLoadStatisticsStore::fireDataModificationHandler()
{
- m_dataAddedHandler();
+ if (m_dataAddedHandler)
+ m_dataAddedHandler();
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
