Skip to content

Defensively cap number_of_leading_zeros in getNationalSignificantNumber #4010

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
ghaithabdulreda wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −4
Open

Defensively cap number_of_leading_zeros in getNationalSignificantNumber #4010

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
7 changes: 4 additions & 3 deletions cpp/src/phonenumbers/phonenumberutil.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2678,10 +2678,11 @@ void PhoneNumberUtil::GetNationalSignificantNumber(
string* national_number) const {
DCHECK(national_number);
// If leading zero(s) have been set, we prefix this now. Note this is not a
// national prefix. Ensure the number of leading zeros is at least 0 so we
// don't crash in the case of malicious input.
// national prefix. Defensively cap the number of leading zeros to avoid OOM
// from malicious input. Ensure the number of leading zeros is at least 0 so
// we don't crash in the case of malicious input.
StrAppend(national_number, number.italian_leading_zero() ?
string(std::max(number.number_of_leading_zeros(), 0), '0') : "");
string(std::min(std::max(number.number_of_leading_zeros(), 0), 3), '0') : "");
StrAppend(national_number, number.national_number());
}

Expand Down
4 changes: 3 additions & 1 deletion java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1928,9 +1928,11 @@ public String formatOutOfCountryKeepingAlphaChars(PhoneNumber number,
*/
public String getNationalSignificantNumber(PhoneNumber number) {
// If leading zero(s) have been set, we prefix this now. Note this is not a national prefix.
// Defensively cap the number of leading zeros to avoid OOM from malicious input.
StringBuilder nationalNumber = new StringBuilder();
if (number.isItalianLeadingZero() && number.getNumberOfLeadingZeros() > 0) {
char[] zeros = new char[number.getNumberOfLeadingZeros()];
int numberOfLeadingZeros = Math.min(number.getNumberOfLeadingZeros(), 3);
char[] zeros = new char[numberOfLeadingZeros];
Arrays.fill(zeros, '0');
nationalNumber.append(new String(zeros));
}
Expand Down