diff options
| author | Pale Moon <git-repo@palemoon.org> | 2016-03-31 14:47:55 +0200 |
|---|---|---|
| committer | Pale Moon <git-repo@palemoon.org> | 2016-03-31 14:47:55 +0200 |
| commit | 117a558f16fae1dc94aca5d92d33b312336728b9 (patch) | |
| tree | 589bd5b95713c9abc81230a4f21138a2b21b9ebb | |
| parent | 77f85893b4ad37d6ba8a037eb3253fff1dc2e1b7 (diff) | |
| download | palemoon-gre-117a558f16fae1dc94aca5d92d33b312336728b9.tar.gz | |
Crash fix in HTML parser.
| -rw-r--r-- | parser/html/javasrc/TreeBuilder.java | 2 | ||||
| -rw-r--r-- | parser/html/nsHtml5TreeBuilder.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/parser/html/javasrc/TreeBuilder.java b/parser/html/javasrc/TreeBuilder.java index 7e8783bfc..7cbb4d062 100644 --- a/parser/html/javasrc/TreeBuilder.java +++ b/parser/html/javasrc/TreeBuilder.java @@ -4284,7 +4284,7 @@ public abstract class TreeBuilder<T> implements TokenHandler, int eltGroup = stack[eltPos].getGroup(); while (currentPtr > eltPos) { // > not >= intentional if (stack[currentPtr].getGroup() == TEMPLATE - && (eltGroup == TABLE || eltGroup == TBODY_OR_THEAD_OR_TFOOT|| eltGroup == TR || eltGroup == HTML)) { + && (eltGroup == TABLE || eltGroup == TBODY_OR_THEAD_OR_TFOOT|| eltGroup == TR || eltPos == 0)) { return; } pop(); diff --git a/parser/html/nsHtml5TreeBuilder.cpp b/parser/html/nsHtml5TreeBuilder.cpp index 9af459645..80bd7aa21 100644 --- a/parser/html/nsHtml5TreeBuilder.cpp +++ b/parser/html/nsHtml5TreeBuilder.cpp @@ -3216,7 +3216,7 @@ nsHtml5TreeBuilder::clearStackBackTo(int32_t eltPos) { int32_t eltGroup = stack[eltPos]->getGroup(); while (currentPtr > eltPos) { - if (stack[currentPtr]->getGroup() == NS_HTML5TREE_BUILDER_TEMPLATE && (eltGroup == NS_HTML5TREE_BUILDER_TABLE || eltGroup == NS_HTML5TREE_BUILDER_TBODY_OR_THEAD_OR_TFOOT || eltGroup == NS_HTML5TREE_BUILDER_TR || eltGroup == NS_HTML5TREE_BUILDER_HTML)) { + if (stack[currentPtr]->getGroup() == NS_HTML5TREE_BUILDER_TEMPLATE && (eltGroup == NS_HTML5TREE_BUILDER_TABLE || eltGroup == NS_HTML5TREE_BUILDER_TBODY_OR_THEAD_OR_TFOOT || eltGroup == NS_HTML5TREE_BUILDER_TR || !eltPos)) { return; } pop(); |