Fix Index OOB after interrupted DB commit

Topheee · Mar 27, 2024 · a4b403f · a4b403f
1 parent 8639971
commit a4b403f
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/MatrixSDK/Data/Store/MXFileStore/MXFileStore.m b/MatrixSDK/Data/Store/MXFileStore/MXFileStore.m
@@ -2420,8 +2420,8 @@ - (NSArray*)filesAtPath:(NSString*)path
 
     NSDirectoryEnumerator *enumerator = [[NSFileManager defaultManager]
                                          enumeratorAtURL:[NSURL URLWithString:path]
-                                         includingPropertiesForKeys:nil
-                                         options:0
+                                         includingPropertiesForKeys:@[NSURLIsDirectoryKey]
+                                         options:NSDirectoryEnumerationProducesRelativePathURLs
                                          errorHandler:^(NSURL *url, NSError *error) {
                                              return YES;
                                          }];
@@ -2434,11 +2434,7 @@ - (NSArray*)filesAtPath:(NSString*)path
         if ([url getResourceValue:&isDirectory forKey:NSURLIsDirectoryKey error:nil] && ![isDirectory boolValue])
         {
             // Return a file path relative to 'path'
-            NSRange range = [url.absoluteString rangeOfString:path];
-            NSString *relativeFilePath = [url.absoluteString
-                                          substringFromIndex:(range.location + range.length)];
-
-            [files addObject:relativeFilePath];
+            [files addObject:[@"/" stringByAppendingString: url.relativeString]];
         }
     }