From 24c914799dc9cb711b4def0c00e99943437c69fe Mon Sep 17 00:00:00 2001 From: BlackDex Date: Sun, 7 Jun 2020 17:57:04 +0200 Subject: [PATCH] Fixes #1022 cloning with attachments When a cipher has one or more attachments it wasn't able to be cloned. This commit fixes that issue. --- src/api/core/ciphers.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/api/core/ciphers.rs b/src/api/core/ciphers.rs index 93e06781..3eac10b8 100644 --- a/src/api/core/ciphers.rs +++ b/src/api/core/ciphers.rs @@ -274,7 +274,10 @@ pub fn update_cipher_from_data( }; if saved_att.cipher_uuid != cipher.uuid { - err!("Attachment is not owned by the cipher") + // Warn and break here since cloning ciphers provides attachment data but will not be cloned. + // If we error out here it will break the whole cloning and causes empty ciphers to appear. + warn!("Attachment is not owned by the cipher"); + break; } saved_att.akey = Some(attachment.Key);