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

Delay breaking out of the parse loop when max_tree_depth is hit #3100

Merged
merged 2 commits into from Jan 17, 2024
Merged

Delay breaking out of the parse loop when max_tree_depth is hit #3100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de6bcd2
Delay breaking out of the parse loop when max_tree_depth is hit
stevecheckoway Jan 16, 2024
2e26a72
Add test
stevecheckoway Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 8 additions & 5 deletions gumbo-parser/src/parser.c
View file
Open in desktop
Expand Up @@ -4826,14 +4826,17 @@ GumboOutput* gumbo_parse_with_options (
// to a token.
if (token.type == GUMBO_TOKEN_END_TAG &&
token.v.end_tag.tag == GUMBO_TAG_UNKNOWN)
{
gumbo_free(token.v.end_tag.name);
token.v.end_tag.name = NULL;
}
if (unlikely(state->_open_elements.length > max_tree_depth)) {
parser._output->status = GUMBO_STATUS_TREE_TOO_DEEP;
gumbo_debug("Tree depth limit exceeded.\n");
break;
}
}

if (unlikely(state->_open_elements.length > max_tree_depth)) {
parser._output->status = GUMBO_STATUS_TREE_TOO_DEEP;
gumbo_debug("Tree depth limit exceeded.\n");
break;
}

++loop_count;
assert(loop_count < 1000000000UL);
Expand Down
10 changes: 10 additions & 0 deletions test/test_memory_usage.rb
View file
Open in desktop
Expand Up @@ -301,5 +301,15 @@ def start_element(name, attrs = [])
Nokogiri::HTML5::Document.parse(html)
end
end

it "libgumbo max depth exceeded" do
html = "<html><body>"

memwatch(__method__) do
Nokogiri::HTML5.parse(html, max_tree_depth: 1)
rescue ArgumentError
# Expected error. This comment makes rubocop happy.
end
end
end if ENV["NOKOGIRI_MEMORY_SUITE"] && Nokogiri.uses_libxml?
end