From f9ed9e0c0149e903c6dc17b55b7145286291bc41 Mon Sep 17 00:00:00 2001
From: Luke Chang <lchang@mozilla.com>
Date: Thu, 20 Jul 2017 13:30:53 +0800
Subject: [PATCH] Bug 1382529 - [Form Autofill] Exception occurs when saving a
 telephone number like "1234567". r=steveck

MozReview-Commit-ID: mJ3KJemnme

--HG--
extra : rebase_source : c4a7b2e5273bac8d941bd558adc49aced331b2e6
---
 browser/extensions/formautofill/ProfileStorage.jsm       | 2 +-
 .../formautofill/test/unit/test_transformFields.js       | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/browser/extensions/formautofill/ProfileStorage.jsm b/browser/extensions/formautofill/ProfileStorage.jsm
index 1946b0a5213d..51fb2ac99e60 100644
--- a/browser/extensions/formautofill/ProfileStorage.jsm
+++ b/browser/extensions/formautofill/ProfileStorage.jsm
@@ -1341,7 +1341,7 @@ class Addresses extends AutofillRecords {
     }
 
     let tel = PhoneNumber.Parse(number, region);
-    if (tel) {
+    if (tel && tel.internationalNumber) {
       // Force to save numbers in E.164 format if parse success.
       address.tel = tel.internationalNumber;
     } else if (!address.tel) {
diff --git a/browser/extensions/formautofill/test/unit/test_transformFields.js b/browser/extensions/formautofill/test/unit/test_transformFields.js
index f79800974485..fb58899ee5bb 100644
--- a/browser/extensions/formautofill/test/unit/test_transformFields.js
+++ b/browser/extensions/formautofill/test/unit/test_transformFields.js
@@ -390,6 +390,15 @@ const ADDRESS_NORMALIZE_TESTCASES = [
       "tel": "12345",
     },
   },
+  {
+    description: "Has a valid tel-local format \"tel\"",
+    address: {
+      "tel": "1234567",
+    },
+    expectedResult: {
+      "tel": "1234567",
+    },
+  },
   {
     description: "Has \"tel-national\" and \"tel-country-code\"",
     address: {