diff options
| -rw-r--r-- | java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java b/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java index 16a975e9..d65de331 100644 --- a/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java +++ b/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java @@ -2027,6 +2027,10 @@ public class PhoneNumberUtil { // 0 if fullNumber doesn't start with a valid country calling code, and leaves nationalNumber // unmodified. int extractCountryCode(StringBuilder fullNumber, StringBuilder nationalNumber) { + if ((fullNumber.length() == 0) || (fullNumber.charAt(0) == '0')) { + // Country codes do not begin with a '0'. + return 0; + } int potentialCountryCode; int numberLength = fullNumber.length(); for (int i = 1; i <= MAX_LENGTH_COUNTRY_CODE && i <= numberLength; i++) { |