Changeset 215845 in webkit

Timestamp:

Apr 26, 2017 5:12:02 PM (7 years ago)

Author:

achristensen@apple.com

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/cf/SharedBufferCF.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-04-26  Alex Christensen  <achristensen@webkit.org>
+
+        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  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp

@@ -69 +69 @@
 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));
+    }
 }