Avoid panic when sending errors after receiver shutdown

fixes sharkdp#678
stevepentland · Oct 28, 2020 · b2fa188 · b2fa188
1 parent e0adb45
commit b2fa188
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 
 ## Bugfixes
 
+- Avoid panic when performing limited searches in directories with restricted permissions, see #678
 - Invalid numeric command-line arguments are silently ignored, see #675
 - Disable jemalloc on Android, see #662
 

diff --git a/src/walk.rs b/src/walk.rs
@@ -358,19 +358,27 @@ fn spawn_senders(
                         DirEntry::BrokenSymlink(path)
                     }
                     _ => {
-                        tx_thread
-                            .send(WorkerResult::Error(ignore::Error::WithPath {
-                                path,
-                                err: inner_err,
-                            }))
-                            .unwrap();
+                        match tx_thread.send(WorkerResult::Error(ignore::Error::WithPath {
+                            path,
+                            err: inner_err,
+                        })) {
+                            Ok(_) => {
+                                return ignore::WalkState::Continue;
+                            }
+                            Err(_) => {
+                                return ignore::WalkState::Quit;
+                            }
+                        }
+                    }
+                },
+                Err(err) => match tx_thread.send(WorkerResult::Error(err)) {
+                    Ok(_) => {
                         return ignore::WalkState::Continue;
                     }
+                    Err(_) => {
+                        return ignore::WalkState::Quit;
+                    }
                 },
-                Err(err) => {
-                    tx_thread.send(WorkerResult::Error(err)).unwrap();
-                    return ignore::WalkState::Continue;
-                }
             };
 
             if let Some(min_depth) = config.min_depth {