Merge pull request #731 from dlyongemallo/master

fix NPE in ShortNumberInfo when isPossibleNumber is called on a region with no ShortNumberMetadata

cpp/src/phonenumbers/shortnumberinfo.cc

@@ -126,6 +126,9 @@ bool ShortNumberInfo::IsPossibleShortNumber(const PhoneNumber& number) const {
   for (list<string>::const_iterator it = region_codes.begin();
        it != region_codes.end(); ++it) {
     const PhoneMetadata* phone_metadata = GetMetadataForRegion(*it);
+    if (!phone_metadata) {
+      continue;
+    }
     if (matcher_api_->MatchesPossibleNumber(short_number,
                                             phone_metadata->general_desc())) {
       return true;

java/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberInfo.java

@@ -156,6 +156,9 @@ public class ShortNumberInfo {
     String shortNumber = getNationalSignificantNumber(number);
     for (String region : regionCodes) {
       PhoneMetadata phoneMetadata = MetadataManager.getShortNumberMetadataForRegion(region);
+      if (phoneMetadata == null) {
+        continue;
+      }
       if (matcherApi.matchesPossibleNumber(shortNumber, phoneMetadata.getGeneralDesc())) {
         return true;
       }