Skip to content

Fix ReDoS in RFC3966 domain validation and integer underflow in matcher #3987

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

Open
sharadboni wants to merge 2 commits into
base: master
Choose a base branch
from
+7 −2
Open

Fix ReDoS in RFC3966 domain validation and integer underflow in matcher #3987

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
80bb9c0
Fix ReDoS in RFC3966 domain validation and integer underflow in matcher
sharadboni Apr 15, 2026
797924b
Fix regex to allow consecutive hyphens in domain labels
sharadboni Apr 16, 2026
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
5 changes: 5 additions & 0 deletions cpp/src/phonenumbers/phonenumbermatcher.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,6 +837,11 @@ bool PhoneNumberMatcher::AllNumberGroupsAreExactlyPresent(
candidate_groups.push_back(digit_block);
}

// Guard against size_t underflow when candidate_groups is empty.
if (candidate_groups.empty()) {
return false;
}

// Set this to the last group, skipping it if the number has an extension.
int candidate_number_group_index = static_cast<int>(
phone_number.has_extension() ? candidate_groups.size() - 2
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/phonenumbers/phonenumberutil.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,9 +790,9 @@ class PhoneNumberRegExpsAndMappings {
StrCat("(", kDigits, "|", kRfc3966VisualSeparator, ")")),
alphanum_(StrCat(kValidAlphaInclUppercase, kDigits)),
rfc3966_domainlabel_(
StrCat("[", alphanum_, "]+((\\-)*[", alphanum_, "])*")),
StrCat("[", alphanum_, "]+(-+[", alphanum_, "]+)*")),
rfc3966_toplabel_(StrCat("[", kValidAlphaInclUppercase,
"]+((\\-)*[", alphanum_, "])*")),
"]+(-+[", alphanum_, "]+)*")),
regexp_factory_(new RegExpFactory()),
regexp_cache_(new RegExpCache(*regexp_factory_.get(), 128)),
diallable_char_mappings_(),
Expand Down