Merge pull request #31097 from arcturus/bug-1178241

Bug 1178241 - [vCard] 'undefined' is displayed when a field exist but…
mozilla-b2g · Aug 5, 2015 · 74b3468 · 74b3468
2 parents b795c40 + c7b6b76
commit 74b3468
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/apps/communications/contacts/test/unit/vcard_parsing_test.js b/apps/communications/contacts/test/unit/vcard_parsing_test.js
@@ -671,5 +671,16 @@ suite('vCard parsing settings', function() {
         });
       });
     });
+    test('- vcard with fields with empty values', function(done) {
+      initializeVCFReader('vcard_undefined.vcf', function(reader) {
+        reader.onread = stub();
+        reader.onimported = stub();
+        reader.onerror = stub();
+        reader.process(function(result) {
+          sinon.assert.length(result, 1);
+          sinon.assert.length(result[0].org, 0);
+        });
+      });
+    });
   });
 });
diff --git a/apps/communications/contacts/test/unit/vcards/vcard_undefined.vcf b/apps/communications/contacts/test/unit/vcards/vcard_undefined.vcf
@@ -0,0 +1,7 @@
+BEGIN:VCARD
+VERSION:3.0
+FN;CHARSET=utf-8:First Last
+N;CHARSET=utf-8:Last;First;;
+ORG:;
+EMAIL;TYPE=HOME;TYPE=PREF:first.last@email.tld
+END:VCARD
diff --git a/shared/js/contacts/import/utilities/vcard_parser.js b/shared/js/contacts/import/utilities/vcard_parser.js
@@ -472,6 +472,10 @@ var VCFReader = (function _VCFReader() {
 
       var v = vcardObj[field][0];
 
+      if (!v || !Array.isArray(v.value) || v.value.length === 0) {
+        return;
+      }
+
       var dateValue;
       if (field === 'bday') {
         dateValue = v.value[0];