Fix fsevent crash (mutating array in iteration) (#132)

notify-rs · Nov 21, 2017 · b5672b5 · b5672b5
1 parent b574d4e
commit b5672b5
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/fsevent.rs b/src/fsevent.rs
@@ -120,13 +120,18 @@ impl FsEventWatcher {
         unsafe {
             let cf_path = cf::str_path_to_cfstring_ref(str_path);
 
+            let mut to_remove = Vec::new();
             for idx in 0..cf::CFArrayGetCount(self.paths) {
                 let item = cf::CFArrayGetValueAtIndex(self.paths, idx);
                 if cf::CFStringCompare(item, cf_path, cf::kCFCompareCaseInsensitive) ==
                    cf::kCFCompareEqualTo {
-                    cf::CFArrayRemoveValueAtIndex(self.paths, idx);
+                       to_remove.push(idx);
                 }
             }
+
+            for idx in to_remove.iter().rev() {
+                cf::CFArrayRemoveValueAtIndex(self.paths, *idx);
+            }
         }
         let p = if let Ok(canonicalized_path) = path.as_ref().canonicalize() {
             canonicalized_path