Title: [171254] branches/safari-537.78-branch
Diff
Modified: branches/safari-537.78-branch/LayoutTests/ChangeLog (171253 => 171254)
--- branches/safari-537.78-branch/LayoutTests/ChangeLog 2014-07-19 00:21:56 UTC (rev 171253)
+++ branches/safari-537.78-branch/LayoutTests/ChangeLog 2014-07-19 00:47:31 UTC (rev 171254)
@@ -1,3 +1,18 @@
+2014-07-18 Dana Burkart <[email protected]>
+
+ Merge r169318
+
+ 2014-05-25 David Kilzer <[email protected]>
+
+ Crash in WebCore::TextResourceDecoder::checkForCSSCharset
+ <http://webkit.org/b/133257>
+ <rdar://problem/17027109>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * fast/encoding/css-charset-missing-semi-colon-and-newline-expected.txt: Added.
+ * fast/encoding/css-charset-missing-semi-colon-and-newline.html: Added.
+
2014-05-23 Dana Burkart <[email protected]>
Merge r167832
Copied: branches/safari-537.78-branch/LayoutTests/fast/encoding/css-charset-missing-semi-colon-and-newline-expected.txt (from rev 169318, trunk/LayoutTests/fast/encoding/css-charset-missing-semi-colon-and-newline-expected.txt) (0 => 171254)
--- branches/safari-537.78-branch/LayoutTests/fast/encoding/css-charset-missing-semi-colon-and-newline-expected.txt (rev 0)
+++ branches/safari-537.78-branch/LayoutTests/fast/encoding/css-charset-missing-semi-colon-and-newline-expected.txt 2014-07-19 00:47:31 UTC (rev 171254)
@@ -0,0 +1 @@
+PASS: This test passes if it does not crash.
Copied: branches/safari-537.78-branch/LayoutTests/fast/encoding/css-charset-missing-semi-colon-and-newline.html (from rev 169318, trunk/LayoutTests/fast/encoding/css-charset-missing-semi-colon-and-newline.html) (0 => 171254)
--- branches/safari-537.78-branch/LayoutTests/fast/encoding/css-charset-missing-semi-colon-and-newline.html (rev 0)
+++ branches/safari-537.78-branch/LayoutTests/fast/encoding/css-charset-missing-semi-colon-and-newline.html 2014-07-19 00:47:31 UTC (rev 171254)
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<link href="" rel="stylesheet">
+</head>
+<body>
+<p>PASS: This test passes if it does not crash.</p>
+</body>
+</html>
Modified: branches/safari-537.78-branch/Source/WebCore/ChangeLog (171253 => 171254)
--- branches/safari-537.78-branch/Source/WebCore/ChangeLog 2014-07-19 00:21:56 UTC (rev 171253)
+++ branches/safari-537.78-branch/Source/WebCore/ChangeLog 2014-07-19 00:47:31 UTC (rev 171254)
@@ -1,3 +1,21 @@
+2014-07-18 Dana Burkart <[email protected]>
+
+ Merge r169318
+
+ 2014-05-25 David Kilzer <[email protected]>
+
+ Crash in WebCore::TextResourceDecoder::checkForCSSCharset
+ <http://webkit.org/b/133257>
+ <rdar://problem/17027109>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Test: fast/encoding/css-charset-missing-semi-colon-and-newline.html
+
+ * loader/TextResourceDecoder.cpp:
+ (WebCore::TextResourceDecoder::checkForCSSCharset): Add early
+ return.
+
2014-05-30 Dana Burkart <[email protected]>
Supplementary build fix for <rdar://problem/16848509>, borrowed from <rdar://problem/16701806>.
Modified: branches/safari-537.78-branch/Source/WebCore/loader/TextResourceDecoder.cpp (171253 => 171254)
--- branches/safari-537.78-branch/Source/WebCore/loader/TextResourceDecoder.cpp 2014-07-19 00:21:56 UTC (rev 171253)
+++ branches/safari-537.78-branch/Source/WebCore/loader/TextResourceDecoder.cpp 2014-07-19 00:47:31 UTC (rev 171254)
@@ -488,6 +488,8 @@
int encodingNameLength = pos - dataStart;
++pos;
+ if (pos == dataEnd)
+ return false;
if (*pos == ';')
setEncoding(findTextEncoding(dataStart, encodingNameLength), EncodingFromCSSCharset);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
