summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenri Sivonen <hsivonen@hsivonen.fi>2019-07-20 15:23:12 +0200
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-07-20 15:23:12 +0200
commitc3643770724119efc1ec8b3fe4e2571db0f897b6 (patch)
tree6b4bb753bbfb8ff2c77e8d652a1ba5d76bf74ad5
parent408ca49a029efa54d18234288c04944d2905fecb (diff)
downloadUXP-c3643770724119efc1ec8b3fe4e2571db0f897b6.tar
UXP-c3643770724119efc1ec8b3fe4e2571db0f897b6.tar.gz
UXP-c3643770724119efc1ec8b3fe4e2571db0f897b6.tar.lz
UXP-c3643770724119efc1ec8b3fe4e2571db0f897b6.tar.xz
UXP-c3643770724119efc1ec8b3fe4e2571db0f897b6.zip
Bug 1555523.
-rw-r--r--parser/html/javasrc/Tokenizer.java9
-rw-r--r--parser/html/nsHtml5Tokenizer.cpp7
2 files changed, 5 insertions, 11 deletions
diff --git a/parser/html/javasrc/Tokenizer.java b/parser/html/javasrc/Tokenizer.java
index d9eaafeb3..70e1df75c 100644
--- a/parser/html/javasrc/Tokenizer.java
+++ b/parser/html/javasrc/Tokenizer.java
@@ -3850,12 +3850,9 @@ public class Tokenizer implements Locator {
tokenHandler.characters(
Tokenizer.LT_SOLIDUS, 0, 2);
emitStrBuf();
- if (c == '\u0000') {
- emitReplacementCharacter(buf, pos);
- } else {
- cstart = pos; // don't drop the
- // character
- }
+ cstart = pos; // don't drop the
+ // character
+ reconsume = true;
state = transition(state, returnState, reconsume, pos);
continue stateloop;
}
diff --git a/parser/html/nsHtml5Tokenizer.cpp b/parser/html/nsHtml5Tokenizer.cpp
index a9db8d0c1..e70c081bf 100644
--- a/parser/html/nsHtml5Tokenizer.cpp
+++ b/parser/html/nsHtml5Tokenizer.cpp
@@ -2093,11 +2093,8 @@ nsHtml5Tokenizer::stateLoop(int32_t state, char16_t c, int32_t pos, char16_t* bu
default: {
tokenHandler->characters(nsHtml5Tokenizer::LT_SOLIDUS, 0, 2);
emitStrBuf();
- if (c == '\0') {
- emitReplacementCharacter(buf, pos);
- } else {
- cstart = pos;
- }
+ cstart = pos;
+ reconsume = true;
state = P::transition(mViewSource, returnState, reconsume, pos);
NS_HTML5_CONTINUE(stateloop);
}