Don't panic on NULL bytes

Freaky · Apr 1, 2020 · 730127d · 730127d
1 parent 776035e
commit 730127d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "faccess"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Thomas Hurst <tom@hur.st>"]
 edition = "2018"
 description = "Simple file accessibility checks"

diff --git a/src/lib.rs b/src/lib.rs
@@ -90,7 +90,7 @@ mod imp {
     const AT_EACCESS: c_int = 0;
 
     fn eaccess(p: &Path, mode: c_int) -> io::Result<()> {
-        let path = CString::new(p.as_os_str().as_bytes()).expect("Path can't contain NULL");
+        let path = CString::new(p.as_os_str().as_bytes())?;
         unsafe {
             if faccessat(AT_FDCWD, path.as_ptr() as *const i8, mode, AT_EACCESS) == 0 {
                 Ok(())
@@ -572,4 +572,6 @@ fn amazing_test_suite() {
     assert!(!missing.readable());
     assert!(!missing.writable());
     assert!(!missing.executable());
+
+    assert!(Path::new("\0").access(AccessMode::EXISTS).is_err());
 }