Title: [104214] branches/safari-534.54-branch
Diff
Modified: branches/safari-534.54-branch/LayoutTests/ChangeLog (104213 => 104214)
--- branches/safari-534.54-branch/LayoutTests/ChangeLog 2012-01-05 21:58:07 UTC (rev 104213)
+++ branches/safari-534.54-branch/LayoutTests/ChangeLog 2012-01-05 22:00:07 UTC (rev 104214)
@@ -1,5 +1,19 @@
2011-1-5 Lucas Forschler <[email protected]>
+ Merge 98344
+
+ 2011-10-25 Justin Schuh <[email protected]>
+
+ Check for empty string in parseArcFlag
+ https://bugs.webkit.org/show_bug.cgi?id=70763
+
+ Reviewed by Dirk Schulze.
+
+ * svg/path-arc-invalid-expected.txt: Added.
+ * svg/path-arc-invalid.html: Added.
+
+2011-1-5 Lucas Forschler <[email protected]>
+
Merge 98033
2011-10-20 Julien Chaffraix <[email protected]>
Copied: branches/safari-534.54-branch/LayoutTests/svg/path-arc-invalid-expected.txt (from rev 98344, trunk/LayoutTests/svg/path-arc-invalid-expected.txt) (0 => 104214)
--- branches/safari-534.54-branch/LayoutTests/svg/path-arc-invalid-expected.txt (rev 0)
+++ branches/safari-534.54-branch/LayoutTests/svg/path-arc-invalid-expected.txt 2012-01-05 22:00:07 UTC (rev 104214)
@@ -0,0 +1,2 @@
+CONSOLE MESSAGE: line 6: Error: Problem parsing d="M0 0 A0 0 0 0 0 0 0 0 0 0"
+If this text is visible the malformed SVG path is handled correctly.
Copied: branches/safari-534.54-branch/LayoutTests/svg/path-arc-invalid.html (from rev 98344, trunk/LayoutTests/svg/path-arc-invalid.html) (0 => 104214)
--- branches/safari-534.54-branch/LayoutTests/svg/path-arc-invalid.html (rev 0)
+++ branches/safari-534.54-branch/LayoutTests/svg/path-arc-invalid.html 2012-01-05 22:00:07 UTC (rev 104214)
@@ -0,0 +1,8 @@
+<script>
+if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+</script>
+<svg>
+<path d="M0 0 A0 0 0 0 0 0 0 0 0 0"/>
+</svg>
+If this text is visible the malformed SVG path is handled correctly.
Modified: branches/safari-534.54-branch/Source/WebCore/ChangeLog (104213 => 104214)
--- branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-05 21:58:07 UTC (rev 104213)
+++ branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-05 22:00:07 UTC (rev 104214)
@@ -1,5 +1,21 @@
2011-1-5 Lucas Forschler <[email protected]>
+ Merge 98344
+
+ 2011-10-25 Justin Schuh <[email protected]>
+
+ Check for empty string in parseArcFlag
+ https://bugs.webkit.org/show_bug.cgi?id=70763
+
+ Reviewed by Dirk Schulze.
+
+ Test: svg/path-invalid.html
+
+ * svg/SVGParserUtilities.cpp:
+ (WebCore::parseArcFlag):
+
+2011-1-5 Lucas Forschler <[email protected]>
+
Merge 98033
2011-10-20 Julien Chaffraix <[email protected]>
Modified: branches/safari-534.54-branch/Source/WebCore/svg/SVGParserUtilities.cpp (104213 => 104214)
--- branches/safari-534.54-branch/Source/WebCore/svg/SVGParserUtilities.cpp 2012-01-05 21:58:07 UTC (rev 104213)
+++ branches/safari-534.54-branch/Source/WebCore/svg/SVGParserUtilities.cpp 2012-01-05 22:00:07 UTC (rev 104214)
@@ -151,6 +151,8 @@
// and might not have any whitespace/comma after it
bool parseArcFlag(const UChar*& ptr, const UChar* end, bool& flag)
{
+ if (ptr >= end)
+ return false;
const UChar flagChar = *ptr++;
if (flagChar == '0')
flag = false;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
