From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 10 Jun 2012 18:54:52 +0000 (+0200)
Subject: Contacts: 11th hour fix for invalid VCARD from CardDAV.
X-Git-Tag: v4.5.0beta1~74^2~421^2~39
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=40f8419fdf5891ca419d20699b7fc89cd3472afb;p=nextcloud-server.git

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

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index a8ad695f620..20a9e4afc9c 100644
--- 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);
 	}