<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[178128] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/178128">178128</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2015-01-08 13:12:08 -0800 (Thu, 08 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERTION FAILED: character != kEndOfFileMarker in WebCore::HTMLTokenizer::bufferCharacter
https://bugs.webkit.org/show_bug.cgi?id=140179
Reviewed by Anders Carlsson.
Source/WebCore:
Test: fast/parser/numeric-entities.html
* html/parser/HTMLEntityParser.cpp:
(WebCore::HTMLEntityParser::legalEntityFor): Merged adjustEntity logic in here.
Since the type UChar32 is a signed integer, need to check for <= 0, not just 0.
This <= change alone would have fixed the bug.
* xml/parser/CharacterReferenceParserInlines.h:
(WebCore::consumeCharacterReference): Added overflow checking when parsing hex
and decimal character references. This change alone would also have fixed the
bug, but in addition it makes overflow cases reliably generate replacement
characters rather than ignoring the overflow and producing seemingly random
characters. Test cases cover the original reported bug and other overflow cases.
LayoutTests:
* fast/parser/numeric-entities-expected.txt: Added.
* fast/parser/numeric-entities.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLEntityParsercpp">trunk/Source/WebCore/html/parser/HTMLEntityParser.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlparserCharacterReferenceParserInlinesh">trunk/Source/WebCore/xml/parser/CharacterReferenceParserInlines.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastparsernumericentitiesexpectedtxt">trunk/LayoutTests/fast/parser/numeric-entities-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastparsernumericentitieshtml">trunk/LayoutTests/fast/parser/numeric-entities.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (178127 => 178128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-01-08 21:03:50 UTC (rev 178127)
+++ trunk/LayoutTests/ChangeLog 2015-01-08 21:12:08 UTC (rev 178128)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-01-08 Darin Adler <darin@apple.com>
+
+ ASSERTION FAILED: character != kEndOfFileMarker in WebCore::HTMLTokenizer::bufferCharacter
+ https://bugs.webkit.org/show_bug.cgi?id=140179
+
+ Reviewed by Anders Carlsson.
+
+ * fast/parser/numeric-entities-expected.txt: Added.
+ * fast/parser/numeric-entities.html: Added.
+
</ins><span class="cx"> 2015-01-08 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> After updating tests to use kerning, ligatures, and printer fonts, some tests fail
</span></span></pre></div>
<a id="trunkLayoutTestsfastparsernumericentitiesexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/parser/numeric-entities-expected.txt (0 => 178128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/parser/numeric-entities-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/parser/numeric-entities-expected.txt 2015-01-08 21:12:08 UTC (rev 178128)
</span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+PASS testEntity('&#x0;') is "0xFFFD"
+PASS testEntity('&#x10000;') is "0xD800, 0xDC00"
+PASS testEntity('&#x10FFFF;') is "0xDBFF, 0xDFFF"
+PASS testEntity('&#x110000;') is "0xFFFD"
+PASS testEntity('&#xFFFFFF;') is "0xFFFD"
+PASS testEntity('&#xFFFFFFF;') is "0xFFFD"
+PASS testEntity('&#xFFFFFFFF;') is "0xFFFD"
+PASS testEntity('&#xFFFFFFFFF;') is "0xFFFD"
+PASS testEntity('&#xA0A103A0;') is "0xFFFD"
+PASS testEntity('&#x10000;') is "0xD800, 0xDC00"
+PASS testEntity('&#x1000010000;') is "0xFFFD"
+PASS testEntity('&#1;') is "0x1"
+PASS testEntity('&#11;') is "0xB"
+PASS testEntity('&#111;') is "0x6F"
+PASS testEntity('&#1111;') is "0x457"
+PASS testEntity('&#11111;') is "0x2B67"
+PASS testEntity('&#111111;') is "0xD82C, 0xDE07"
+PASS testEntity('&#1111111;') is "0xDBFD, 0xDC47"
+PASS testEntity('&#11111111;') is "0xFFFD"
+PASS testEntity('&#111111111;') is "0xFFFD"
+PASS testEntity('&#1111111111;') is "0xFFFD"
+PASS testEntity('&#11111111111;') is "0xFFFD"
+PASS testEntity('&#x1;') is "0x1"
+PASS testEntity('&#x9;') is "0x9"
+PASS testEntity('&#xA;') is "0xA"
+PASS testEntity('&#xB;') is "0xB"
+PASS testEntity('&#xC;') is "0xC"
+PASS testEntity('&#xD;') is "0xD"
+PASS testEntity('&#x7F;') is "0x7F"
+PASS testEntity('&#x81;') is "0x81"
+PASS testEntity('&#x8D;') is "0x8D"
+PASS testEntity('&#x8F;') is "0x8F"
+PASS testEntity('&#x90;') is "0x90"
+PASS testEntity('&#x9D;') is "0x9D"
+PASS testEntity('&#x80;') is "0x20AC"
+PASS testEntity('&#x82;') is "0x201A"
+PASS testEntity('&#x83;') is "0x192"
+PASS testEntity('&#x84;') is "0x201E"
+PASS testEntity('&#x85;') is "0x2026"
+PASS testEntity('&#x86;') is "0x2020"
+PASS testEntity('&#x87;') is "0x2021"
+PASS testEntity('&#x88;') is "0x2C6"
+PASS testEntity('&#x89;') is "0x2030"
+PASS testEntity('&#x8A;') is "0x160"
+PASS testEntity('&#x8B;') is "0x2039"
+PASS testEntity('&#x8C;') is "0x152"
+PASS testEntity('&#x8E;') is "0x17D"
+PASS testEntity('&#x91;') is "0x2018"
+PASS testEntity('&#x92;') is "0x2019"
+PASS testEntity('&#x93;') is "0x201C"
+PASS testEntity('&#x94;') is "0x201D"
+PASS testEntity('&#x95;') is "0x2022"
+PASS testEntity('&#x96;') is "0x2013"
+PASS testEntity('&#x97;') is "0x2014"
+PASS testEntity('&#x98;') is "0x2DC"
+PASS testEntity('&#x99;') is "0x2122"
+PASS testEntity('&#x9A;') is "0x161"
+PASS testEntity('&#x9B;') is "0x203A"
+PASS testEntity('&#x9C;') is "0x153"
+PASS testEntity('&#x9E;') is "0x17E"
+PASS testEntity('&#x9F;') is "0x178"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastparsernumericentitieshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/parser/numeric-entities.html (0 => 178128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/parser/numeric-entities.html (rev 0)
+++ trunk/LayoutTests/fast/parser/numeric-entities.html 2015-01-08 21:12:08 UTC (rev 178128)
</span><span class="lines">@@ -0,0 +1,95 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+function testEntity(entity)
+{
+ var element = document.createElement("div")
+ element.innerHTML = entity;
+ var string = element.firstChild.data;
+ var result = "";
+ for (var i = 0; i < string.length; ++i) {
+ if (result.length)
+ result += ", "
+ result += "0x" + string.charCodeAt(i).toString(16).toUpperCase();
+ }
+ return result;
+}
+
+shouldBeEqualToString("testEntity('&#x0;')", "0xFFFD");
+shouldBeEqualToString("testEntity('&#x10000;')", "0xD800, 0xDC00");
+shouldBeEqualToString("testEntity('&#x10FFFF;')", "0xDBFF, 0xDFFF");
+shouldBeEqualToString("testEntity('&#x110000;')", "0xFFFD");
+shouldBeEqualToString("testEntity('&#xFFFFFF;')", "0xFFFD");
+shouldBeEqualToString("testEntity('&#xFFFFFFF;')", "0xFFFD");
+shouldBeEqualToString("testEntity('&#xFFFFFFFF;')", "0xFFFD");
+shouldBeEqualToString("testEntity('&#xFFFFFFFFF;')", "0xFFFD");
+shouldBeEqualToString("testEntity('&#xA0A103A0;')", "0xFFFD");
+
+shouldBeEqualToString("testEntity('&#x10000;')", "0xD800, 0xDC00");
+shouldBeEqualToString("testEntity('&#x1000010000;')", "0xFFFD");
+
+shouldBeEqualToString("testEntity('&#1;')", "0x1");
+shouldBeEqualToString("testEntity('&#11;')", "0xB");
+shouldBeEqualToString("testEntity('&#111;')", "0x6F");
+shouldBeEqualToString("testEntity('&#1111;')", "0x457");
+shouldBeEqualToString("testEntity('&#11111;')", "0x2B67");
+shouldBeEqualToString("testEntity('&#111111;')", "0xD82C, 0xDE07");
+shouldBeEqualToString("testEntity('&#1111111;')", "0xDBFD, 0xDC47");
+shouldBeEqualToString("testEntity('&#11111111;')", "0xFFFD");
+shouldBeEqualToString("testEntity('&#111111111;')", "0xFFFD");
+shouldBeEqualToString("testEntity('&#1111111111;')", "0xFFFD");
+shouldBeEqualToString("testEntity('&#11111111111;')", "0xFFFD");
+
+shouldBeEqualToString("testEntity('&#x1;')", "0x1");
+shouldBeEqualToString("testEntity('&#x9;')", "0x9");
+shouldBeEqualToString("testEntity('&#xA;')", "0xA");
+shouldBeEqualToString("testEntity('&#xB;')", "0xB");
+shouldBeEqualToString("testEntity('&#xC;')", "0xC");
+shouldBeEqualToString("testEntity('&#xD;')", "0xD");
+shouldBeEqualToString("testEntity('&#x7F;')", "0x7F");
+shouldBeEqualToString("testEntity('&#x81;')", "0x81");
+shouldBeEqualToString("testEntity('&#x8D;')", "0x8D");
+shouldBeEqualToString("testEntity('&#x8F;')", "0x8F");
+shouldBeEqualToString("testEntity('&#x90;')", "0x90");
+shouldBeEqualToString("testEntity('&#x9D;')", "0x9D");
+
+shouldBeEqualToString("testEntity('&#x80;')", "0x20AC");
+shouldBeEqualToString("testEntity('&#x82;')", "0x201A");
+shouldBeEqualToString("testEntity('&#x83;')", "0x192");
+shouldBeEqualToString("testEntity('&#x84;')", "0x201E");
+shouldBeEqualToString("testEntity('&#x85;')", "0x2026");
+shouldBeEqualToString("testEntity('&#x86;')", "0x2020");
+shouldBeEqualToString("testEntity('&#x87;')", "0x2021");
+shouldBeEqualToString("testEntity('&#x88;')", "0x2C6");
+shouldBeEqualToString("testEntity('&#x89;')", "0x2030");
+shouldBeEqualToString("testEntity('&#x8A;')", "0x160");
+shouldBeEqualToString("testEntity('&#x8B;')", "0x2039");
+shouldBeEqualToString("testEntity('&#x8C;')", "0x152");
+shouldBeEqualToString("testEntity('&#x8E;')", "0x17D");
+shouldBeEqualToString("testEntity('&#x91;')", "0x2018");
+shouldBeEqualToString("testEntity('&#x92;')", "0x2019");
+shouldBeEqualToString("testEntity('&#x93;')", "0x201C");
+shouldBeEqualToString("testEntity('&#x94;')", "0x201D");
+shouldBeEqualToString("testEntity('&#x95;')", "0x2022");
+shouldBeEqualToString("testEntity('&#x96;')", "0x2013");
+shouldBeEqualToString("testEntity('&#x97;')", "0x2014");
+shouldBeEqualToString("testEntity('&#x98;')", "0x2DC");
+shouldBeEqualToString("testEntity('&#x99;')", "0x2122");
+shouldBeEqualToString("testEntity('&#x9A;')", "0x161");
+shouldBeEqualToString("testEntity('&#x9B;')", "0x203A");
+shouldBeEqualToString("testEntity('&#x9C;')", "0x153");
+shouldBeEqualToString("testEntity('&#x9E;')", "0x17E");
+shouldBeEqualToString("testEntity('&#x9F;')", "0x178");
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</head>
+<body>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178127 => 178128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-08 21:03:50 UTC (rev 178127)
+++ trunk/Source/WebCore/ChangeLog 2015-01-08 21:12:08 UTC (rev 178128)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-01-08 Darin Adler <darin@apple.com>
+
+ ASSERTION FAILED: character != kEndOfFileMarker in WebCore::HTMLTokenizer::bufferCharacter
+ https://bugs.webkit.org/show_bug.cgi?id=140179
+
+ Reviewed by Anders Carlsson.
+
+ Test: fast/parser/numeric-entities.html
+
+ * html/parser/HTMLEntityParser.cpp:
+ (WebCore::HTMLEntityParser::legalEntityFor): Merged adjustEntity logic in here.
+ Since the type UChar32 is a signed integer, need to check for <= 0, not just 0.
+ This <= change alone would have fixed the bug.
+
+ * xml/parser/CharacterReferenceParserInlines.h:
+ (WebCore::consumeCharacterReference): Added overflow checking when parsing hex
+ and decimal character references. This change alone would also have fixed the
+ bug, but in addition it makes overflow cases reliably generate replacement
+ characters rather than ignoring the overflow and producing seemingly random
+ characters. Test cases cover the original reported bug and other overflow cases.
+
</ins><span class="cx"> 2015-01-08 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Text not drawn or white-on-white for "Close Page"/"Go Back" button on safe browsing warning page
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLEntityParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLEntityParser.cpp (178127 => 178128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLEntityParser.cpp 2015-01-08 21:03:50 UTC (rev 178127)
+++ trunk/Source/WebCore/html/parser/HTMLEntityParser.cpp 2015-01-08 21:12:08 UTC (rev 178128)
</span><span class="lines">@@ -51,23 +51,15 @@
</span><span class="cx">
</span><span class="cx"> class HTMLEntityParser {
</span><span class="cx"> public:
</span><del>- inline static UChar adjustEntity(UChar32 value)
</del><ins>+ static UChar32 legalEntityFor(UChar32 value)
</ins><span class="cx"> {
</span><del>- if ((value & ~0x1F) != 0x0080)
</del><ins>+ if (value <= 0 || value > 0x10FFFF || (value >= 0xD800 && value <= 0xDFFF))
+ return 0xFFFD;
+ if ((value & ~0x1F) != 0x80)
</ins><span class="cx"> return value;
</span><span class="cx"> return windowsLatin1ExtensionArray[value - 0x80];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- inline static UChar32 legalEntityFor(UChar32 value)
- {
- // FIXME: A number of specific entity values generate parse errors.
- if (!value || value > 0x10FFFF || (value >= 0xD800 && value <= 0xDFFF))
- return 0xFFFD;
- if (U_IS_BMP(value))
- return adjustEntity(value);
- return value;
- }
-
</del><span class="cx"> inline static bool acceptMalformed() { return true; }
</span><span class="cx">
</span><span class="cx"> inline static bool consumeNamedEntity(SegmentedString& source, StringBuilder& decodedEntity, bool& notEnoughCharacters, UChar additionalAllowedCharacter, UChar& cc)
</span></span></pre></div>
<a id="trunkSourceWebCorexmlparserCharacterReferenceParserInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/parser/CharacterReferenceParserInlines.h (178127 => 178128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/parser/CharacterReferenceParserInlines.h 2015-01-08 21:03:50 UTC (rev 178127)
+++ trunk/Source/WebCore/xml/parser/CharacterReferenceParserInlines.h 2015-01-08 21:12:08 UTC (rev 178128)
</span><span class="lines">@@ -65,6 +65,8 @@
</span><span class="cx"> };
</span><span class="cx"> EntityState entityState = Initial;
</span><span class="cx"> UChar32 result = 0;
</span><ins>+ bool overflow = false;
+ const UChar32 highestValidCharacter = 0x10FFFF;
</ins><span class="cx"> StringBuilder consumedCharacters;
</span><span class="cx">
</span><span class="cx"> while (!source.isEmpty()) {
</span><span class="lines">@@ -128,15 +130,17 @@
</span><span class="cx"> result = result * 16 + 10 + cc - 'A';
</span><span class="cx"> else if (cc == ';') {
</span><span class="cx"> source.advanceAndASSERT(cc);
</span><del>- decodedCharacter.append(ParserFunctions::legalEntityFor(result));
</del><ins>+ decodedCharacter.append(ParserFunctions::legalEntityFor(overflow ? 0 : result));
</ins><span class="cx"> return true;
</span><span class="cx"> } else if (ParserFunctions::acceptMalformed()) {
</span><del>- decodedCharacter.append(ParserFunctions::legalEntityFor(result));
</del><ins>+ decodedCharacter.append(ParserFunctions::legalEntityFor(overflow ? 0 : result));
</ins><span class="cx"> return true;
</span><span class="cx"> } else {
</span><span class="cx"> unconsumeCharacters(source, consumedCharacters);
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><ins>+ if (result > highestValidCharacter)
+ overflow = true;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case Decimal: {
</span><span class="lines">@@ -144,15 +148,17 @@
</span><span class="cx"> result = result * 10 + cc - '0';
</span><span class="cx"> else if (cc == ';') {
</span><span class="cx"> source.advanceAndASSERT(cc);
</span><del>- decodedCharacter.append(ParserFunctions::legalEntityFor(result));
</del><ins>+ decodedCharacter.append(ParserFunctions::legalEntityFor(overflow ? 0 : result));
</ins><span class="cx"> return true;
</span><span class="cx"> } else if (ParserFunctions::acceptMalformed()) {
</span><del>- decodedCharacter.append(ParserFunctions::legalEntityFor(result));
</del><ins>+ decodedCharacter.append(ParserFunctions::legalEntityFor(overflow ? 0 : result));
</ins><span class="cx"> return true;
</span><span class="cx"> } else {
</span><span class="cx"> unconsumeCharacters(source, consumedCharacters);
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><ins>+ if (result > highestValidCharacter)
+ overflow = true;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case Named: {
</span></span></pre>
</div>
</div>
</body>
</html>