Skip to content
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

Jump to bottom

Proposed fix : Disallow replacing nodes with themselves #1844

Closed
wants to merge 1 commit into from
Closed

Proposed fix : Disallow replacing nodes with themselves #1844

Show file tree
Hide file tree
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
12 changes: 12 additions & 0 deletions src/main/java/org/jsoup/helper/Validate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,18 @@ public final class Validate {

private Validate() {}

/**
* Validates that the two objects are not the same.
* @param a First object
* @param b Second object
* @param message Error message to use if the objects are the same
* @throws IllegalArgumentException if the objects are the same
*/
public static void notStrictlyEqual(Object a, Object b, String message) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Personally, I would call this method something like "NotSameObject". To make it clearer that it's an identity check.

if (a == b)
throw new ValidationException(message);
}

/**
* Validates that the object is not null
* @param obj object to test
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/jsoup/nodes/Node.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,7 @@ void nodelistChanged() {
public void replaceWith(Node in) {
Validate.notNull(in);
Validate.notNull(parentNode);
Validate.notStrictlyEqual(this, in, "Cannot replace a node with itself");
parentNode.replaceChild(this, in);
}

Expand Down
22 changes: 22 additions & 0 deletions src/test/java/org/jsoup/nodes/NodeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import org.jsoup.Jsoup;
import org.jsoup.TextUtil;
import org.jsoup.helper.ValidationException;
import org.jsoup.parser.Tag;
import org.jsoup.select.NodeVisitor;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -402,4 +403,25 @@ void firstAndLastChild() {
assertNull(firstEl.firstElementChild());
assertNull(firstEl.lastElementChild());
}

@Test
void replaceWithSelf() {
// Issue 1843

Document doc = new Document("");
Element h1 = doc.body().appendElement("h1");
Element div = doc.body().appendElement("div");

assertDoesNotThrow(doc::toString);

assertThrowsExactly(ValidationException.class, () -> h1.replaceWith(h1));

assertTrue(doc.body().children().contains(h1));
assertTrue(doc.body().children().contains(div));
assertNotNull(h1.parent());
assertNotNull(div.parent());
assertDoesNotThrow(doc::toString);


}
}