Backport #302 to v4

(based on commit 86421e5)
Signed-off-by: Aron Heinecke <[email protected]>

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## 4.0.17 (future)
 
+- FIX: Don't crash on macos when creating & deleting folders in rapid succession [#303]
+
+[#303]: https://github.com/notify-rs/notify/pull/303
 
 ## 4.0.16 (2021-04-14)
 

src/fsevent.rs

@@ -134,6 +134,10 @@ impl FsEventWatcher {
         unsafe {
             let mut err: cf::CFErrorRef = ptr::null_mut();
             let cf_path = cf::str_path_to_cfstring_ref(str_path, &mut err);
+            if cf_path.is_null() {
+                cf::CFRelease(err as cf::CFRef);
+                return Err(Error::WatchNotFound);
+            }
 
             let mut to_remove = Vec::new();
             for idx in 0..cf::CFArrayGetCount(self.paths) {
@@ -173,6 +177,12 @@ impl FsEventWatcher {
         unsafe {
             let mut err: cf::CFErrorRef = ptr::null_mut();
             let cf_path = cf::str_path_to_cfstring_ref(str_path, &mut err);
+            if cf_path.is_null() {
+                // Most likely the directory was deleted, or permissions changed,
+                // while the above code was running.
+                cf::CFRelease(err as cf::CFRef);
+                return Err(Error::PathNotFound);
+            }
             cf::CFArrayAppendValue(self.paths, cf_path);
             cf::CFRelease(cf_path);
         }

tests/race-with-remove-dir.rs

@@ -0,0 +1,34 @@
+use std::{env, fs, thread, time::Duration};
+
+extern crate notify;
+use notify::{RecommendedWatcher, RecursiveMode, Watcher};
+use std::sync::mpsc;
+
+/// Test for <https://github.com/notify-rs/notify/issues/301>.
+/// Note: This test will fail if your temp directory is not writable.
+#[test]
+fn test_race_with_remove_dir() {
+    let tmpdir = env::temp_dir().join(".tmprPcUcB");
+    fs::create_dir_all(&tmpdir).unwrap();
+
+    {
+        let tmpdir = tmpdir.clone();
+        let (tx, rx) = mpsc::channel();
+        thread::spawn(move || {
+            let mut watcher = RecommendedWatcher::new_raw(tx)
+            .unwrap();
+
+            watcher.watch(tmpdir, RecursiveMode::NonRecursive).unwrap();
+        });
+        thread::spawn(move || {
+            for msg in rx {
+                eprintln!("received event: {:?}", msg);
+            }
+        });
+    }
+
+    let subdir = tmpdir.join("146d921d.tmp");
+    fs::create_dir_all(&subdir).unwrap();
+    fs::remove_dir_all(&tmpdir).unwrap();
+    thread::sleep(Duration::from_secs(1));
+}