Changeset 207274 in webkit

Timestamp:

Oct 12, 2016 8:16:15 PM (8 years ago)

Author:

Simon Fraser

Message:

Source/WebCore:
Crash when using megaplan.ru
​https://bugs.webkit.org/show_bug.cgi?id=163276
rdar://problem/28446672

Reviewed by Sam Weinig.

Make sure we allocate enough space in the vector of CGPoints that we use for path building.

Test: css3/masking/large-clip-path.html

• platform/graphics/cg/PathCG.cpp:

(WebCore::Path::polygonPathFromPoints):

LayoutTests:
polygonPathFromPoints calls uncheckedAppend, but assertion size() < capacity() fails
​https://bugs.webkit.org/show_bug.cgi?id=163276

Reviewed by Sam Weinig.

• css3/masking/large-clip-path-expected.txt: Added.
• css3/masking/large-clip-path.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/masking/large-clip-path-expected.txt (added)
• LayoutTests/css3/masking/large-clip-path.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/cg/PathCG.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-10-12  Simon Fraser  <simon.fraser@apple.com>
+
+        polygonPathFromPoints calls uncheckedAppend, but assertion size() < capacity() fails
+        https://bugs.webkit.org/show_bug.cgi?id=163276
+
+        Reviewed by Sam Weinig.
+
+        * css3/masking/large-clip-path-expected.txt: Added.
+        * css3/masking/large-clip-path.html: Added.
+
 2016-10-12  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-12  Simon Fraser  <simon.fraser@apple.com>
+
+        Crash when using megaplan.ru
+        https://bugs.webkit.org/show_bug.cgi?id=163276
+        rdar://problem/28446672
+
+        Reviewed by Sam Weinig.
+
+        Make sure we allocate enough space in the vector of CGPoints that we use for path building.
+
+        Test: css3/masking/large-clip-path.html
+
+        * platform/graphics/cg/PathCG.cpp:
+        (WebCore::Path::polygonPathFromPoints):
+
 2016-10-12  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp

@@ -81 +81 @@
 
     Vector<CGPoint, 32> cgPoints;
-    cgPoints.reserveInitialCapacity(points.size() - 1);
+    cgPoints.reserveInitialCapacity(points.size());
     for (size_t i = 0; i < points.size(); ++i)
         cgPoints.uncheckedAppend(points[i]);