summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2012-06-10 20:54:52 +0200
committerThomas Tanghus <thomas@tanghus.net>2012-06-10 20:54:52 +0200
commitc898a8a6c90fd364bf787916c0f6b35d3f6c1c75 (patch)
tree7dea094037772e3f757cd564c0542409a894602c /apps
parentcdac0eae4684a3b891c885b39aa4ef8035732969 (diff)
downloadnextcloud-server-c898a8a6c90fd364bf787916c0f6b35d3f6c1c75.tar.gz
nextcloud-server-c898a8a6c90fd364bf787916c0f6b35d3f6c1c75.zip
Contacts: 11th hour fix for invalid VCARD from CardDAV.
Diffstat (limited to 'apps')
-rw-r--r--apps/contacts/lib/vcard.php4
1 files changed, 4 insertions, 0 deletions
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);
}