Title: [215845] trunk/Source/WebCore
- Revision
- 215845
- Author
- [email protected]
- Date
- 2017-04-26 17:12:02 -0700 (Wed, 26 Apr 2017)
Log Message
REGRESSION (r215686): ASSERTION FAILED: data seen with webarchive/loading tests
https://bugs.webkit.org/show_bug.cgi?id=171340
Reviewed by Brady Eidson.
This fixes a flaky assertion in webarchive/loading/missing-data.html
* platform/cf/SharedBufferCF.cpp:
(WebCore::SharedBuffer::append):
If there's no CFDataRef, there's no need to append data.
This happens sometimes.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (215844 => 215845)
--- trunk/Source/WebCore/ChangeLog 2017-04-27 00:10:17 UTC (rev 215844)
+++ trunk/Source/WebCore/ChangeLog 2017-04-27 00:12:02 UTC (rev 215845)
@@ -1,3 +1,17 @@
+2017-04-26 Alex Christensen <[email protected]>
+
+ REGRESSION (r215686): ASSERTION FAILED: data seen with webarchive/loading tests
+ https://bugs.webkit.org/show_bug.cgi?id=171340
+
+ Reviewed by Brady Eidson.
+
+ This fixes a flaky assertion in webarchive/loading/missing-data.html
+
+ * platform/cf/SharedBufferCF.cpp:
+ (WebCore::SharedBuffer::append):
+ If there's no CFDataRef, there's no need to append data.
+ This happens sometimes.
+
2017-04-26 Ryan Haddad <[email protected]>
Unreviewed, rolling out r215814.
Modified: trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp (215844 => 215845)
--- trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp 2017-04-27 00:10:17 UTC (rev 215844)
+++ trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp 2017-04-27 00:12:02 UTC (rev 215845)
@@ -68,9 +68,10 @@
void SharedBuffer::append(CFDataRef data)
{
- ASSERT(data);
- m_size += CFDataGetLength(data);
- m_segments.append(DataSegment::create(data));
+ if (data) {
+ m_size += CFDataGetLength(data);
+ m_segments.append(DataSegment::create(data));
+ }
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
