Skip to content

guarding regex call #805

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
lemire merged 3 commits into from
Dec 20, 2024
Merged

guarding regex call #805

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6988803
guarding regex call
Dec 20, 2024
e5a4ef4
lint
Dec 20, 2024
7f945ee
Merge branch 'yagiz/add-url-pattern' into yagiz/add-url-pattern-safe-…
lemire Dec 20, 2024
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
14 changes: 10 additions & 4 deletions src/url_pattern.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,15 +723,21 @@ std::string generate_segment_wildcard_regexp(

bool protocol_component_matches_special_scheme(
ada::url_pattern_component& component) {
// TODO: Optimize this.
auto regex = component.get_regexp();
std::regex rx(regex.data(), regex.size());
std::cmatch cmatch;
return std::regex_match("http", cmatch, rx) ||
try {
std::regex rx(regex.data(), regex.size());
std::cmatch cmatch;
return std::regex_match("http", cmatch, rx) ||
std::regex_match("https", cmatch, rx) ||
std::regex_match("ws", cmatch, rx) ||
std::regex_match("wss", cmatch, rx) ||
std::regex_match("ftp", cmatch, rx);
} catch (...) {
// You probably want to log this error.
ada_log("Error while matching protocol component with special scheme");
ada_log("Regex Input: ", input);
return false;
}
}

} // namespace url_pattern_helpers
Expand Down
Loading