Skip to content

Mozilla bug 2049083 - Ensure nobr follows "any other end tag" #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hsivonen merged 1 commit into from
Sep 8, 2026
Merged

Mozilla bug 2049083 - Ensure nobr follows "any other end tag" #129

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 35 additions & 25 deletions src/nu/validator/htmlparser/impl/TreeBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2081,7 +2081,9 @@ public final void startTag(ElementName elementName,
reconstructTheActiveFormattingElements();
if (TreeBuilder.NOT_FOUND_ON_STACK != findLastInScope("nobr")) {
errFooSeenWhenFooOpen(name);
adoptionAgencyEndTag("nobr");
if (!adoptionAgencyEndTag("nobr")) {
anyOtherEndTagInBody("nobr");
}
reconstructTheActiveFormattingElements();
}
appendToCurrentNodeAndPushFormattingElementMayFoster(
Expand Down Expand Up @@ -3695,30 +3697,8 @@ public final void endTag(ElementName elementName) throws SAXException {
// else handle like any other tag
// CPPONLY: MOZ_FALLTHROUGH;
default:
if (isCurrent(name)) {
pop();
break endtagloop;
}

eltPos = currentPtr;
for (;;) {
StackNode<T> node = stack[eltPos];
if (node.ns == "http://www.w3.org/1999/xhtml" && node.name == name) {
generateImpliedEndTags();
if (errorHandler != null
&& !isCurrent(name)) {
errUnclosedElements(eltPos, name);
}
while (currentPtr >= eltPos) {
pop();
}
break endtagloop;
} else if (eltPos == 0 || node.isSpecial()) {
errStrayEndTag(name);
break endtagloop;
}
eltPos--;
}
anyOtherEndTagInBody(name);
break endtagloop;
}
// CPPONLY: MOZ_FALLTHROUGH;
case IN_HEAD:
Expand Down Expand Up @@ -4433,6 +4413,36 @@ private void removeFromListOfActiveFormattingElements(int pos) {
listPtr--;
}

/**
* The "any other end tag" entry of the "in body" insertion mode.
*/
private void anyOtherEndTagInBody(@Local String name) throws SAXException {
if (isCurrent(name)) {
pop();
return;
}

int eltPos = currentPtr;
for (;;) {
StackNode<T> node = stack[eltPos];
if (node.ns == "http://www.w3.org/1999/xhtml" && node.name == name) {
generateImpliedEndTags();
if (errorHandler != null
&& !isCurrent(name)) {
errUnclosedElements(eltPos, name);
}
while (currentPtr >= eltPos) {
pop();
}
return;
} else if (eltPos == 0 || node.isSpecial()) {
errStrayEndTag(name);
return;
}
eltPos--;
}
}

/**
* Adoption agency algorithm.
*
Expand Down
Loading