Bug 1096172 - Fix position reporting of bad charrefs in RCDATA. r=hsi…

…vonen.
iaxat · Apr 2, 2015 · 24aed70 · 24aed70
1 parent 6b7e4ef
commit 24aed70
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/parser/html/javasrc/Tokenizer.java b/parser/html/javasrc/Tokenizer.java
@@ -3593,7 +3593,7 @@ public boolean tokenizeBuffer(UTF16Buffer buffer) throws SAXException {
                                  */
                                 flushChars(buf, pos);
                                 clearStrBufAndAppend(c);
-                                additional = '\u0000';
+                                setAdditionalAndRememberAmpersandLocation('\u0000');
                                 returnState = state;
                                 state = transition(state, Tokenizer.CONSUME_CHARACTER_REFERENCE, reconsume, pos);
                                 continue stateloop;

diff --git a/parser/html/nsHtml5Tokenizer.cpp b/parser/html/nsHtml5Tokenizer.cpp
@@ -1919,7 +1919,7 @@ nsHtml5Tokenizer::stateLoop(int32_t state, char16_t c, int32_t pos, char16_t* bu
             case '&': {
               flushChars(buf, pos);
               clearStrBufAndAppend(c);
-              additional = '\0';
+              setAdditionalAndRememberAmpersandLocation('\0');
               returnState = state;
               state = P::transition(mViewSource, NS_HTML5TOKENIZER_CONSUME_CHARACTER_REFERENCE, reconsume, pos);
               NS_HTML5_CONTINUE(stateloop);