Merge pull request #1026 from BlackDex/issue-10221.15.1

Fixes #1022 cloning with attachments

1 files changed, 4 insertions, 1 deletions

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);