Fix crash caused by using active directory metadata object after it i…

…s deleted in db Signed-off-by: Claudio Cambra <[email protected]>
claucambra · May 14, 2024 · 6d57766 · 6d57766
1 parent 3596deb
commit 6d57766
Showing 1 changed file with 20 additions and 7 deletions.
diff --git a/Sources/NextcloudFileProviderKit/Database/FilesDatabaseManager+Directories.swift b/Sources/NextcloudFileProviderKit/Database/FilesDatabaseManager+Directories.swift
@@ -97,6 +97,7 @@ extension FilesDatabaseManager {
         }
 
         let directoryMetadataCopy = ItemMetadata(value: directoryMetadata)
+        let directoryOcId = directoryMetadata.ocId
         let directoryUrlPath = directoryMetadata.serverUrl + "/" + directoryMetadata.fileName
         let directoryAccount = directoryMetadata.account
         let directoryEtag = directoryMetadata.etag
@@ -107,7 +108,12 @@ extension FilesDatabaseManager {
 
         guard deleteItemMetadata(ocId: directoryMetadata.ocId) else {
             Self.logger.debug(
-                "Failure to delete root directory metadata in recursive delete. ocID: \(directoryMetadata.ocId, privacy: .public), etag: \(directoryEtag, privacy: .public), serverUrl: \(directoryUrlPath, privacy: .public)"
+                """
+                Failure to delete root directory metadata in recursive delete.
+                ocID: \(directoryOcId, privacy: .public),
+                etag: \(directoryEtag, privacy: .public),
+                serverUrl: \(directoryUrlPath, privacy: .public)
+                """
             )
             return nil
         }
@@ -118,18 +124,25 @@ extension FilesDatabaseManager {
             "account == %@ AND serverUrl BEGINSWITH %@", directoryAccount, directoryUrlPath)
 
         for result in results {
-            let successfulItemMetadataDelete = deleteItemMetadata(ocId: result.ocId)
-            if successfulItemMetadataDelete {
-                deletedMetadatas.append(ItemMetadata(value: result))
+            let resultOcId = result.ocId
+            let inactiveItemMetadata = ItemMetadata(value: result)
+
+            if deleteItemMetadata(ocId: result.ocId) {
+                deletedMetadatas.append(inactiveItemMetadata)
             }
 
-            if localFileMetadataFromOcId(result.ocId) != nil {
-                deleteLocalFileMetadata(ocId: result.ocId)
+            if localFileMetadataFromOcId(resultOcId) != nil {
+                deleteLocalFileMetadata(ocId: resultOcId)
             }
         }
 
         Self.logger.debug(
-            "Completed deletions in directory recursive delete. ocID: \(directoryMetadata.ocId, privacy: .public), etag: \(directoryEtag, privacy: .public), serverUrl: \(directoryUrlPath, privacy: .public)"
+            """
+            Completed deletions in directory recursive delete.
+            ocID: \(directoryOcId, privacy: .public),
+            etag: \(directoryEtag, privacy: .public),
+            serverUrl: \(directoryUrlPath, privacy: .public)
+            """
         )
 
         return deletedMetadatas