Contacts: 11th hour fix for invalid VCARD from CardDAV.

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index a8ad695f6209bfd44121236c9713c59faf7fb806..20a9e4afc9c2c199872aeadaf6b0df4193d89f26 100644 (file)
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -373,6 +373,10 @@ class OC_Contacts_VCard{
        public static function editFromDAVData($aid,$uri,$data){
                $oldcard = self::findWhereDAVDataIs($aid,$uri);
                $card = OC_VObject::parse($data);
+               if(!$card) {
+                       OCP\Util::writeLog('contacts','OC_Contacts_VCard::editFromDAVData. Unable to parse VCARD, uri: '.$uri,OCP\Util::ERROR);
+                       return false;
+               }
                return self::edit($oldcard['id'], $card);
        }