From 1987ae7c77d0e44f63fc5aaeadb8fc9869bdc669 Mon Sep 17 00:00:00 2001
From: 4lDO2 <4lDO2@protonmail.com>
Date: Tue, 23 Aug 2022 10:49:29 +0200
Subject: [PATCH] Check for ENOENT/ENOTDIR in chdir().
---
src/platform/redox/path.rs | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/platform/redox/path.rs b/src/platform/redox/path.rs
index 45e3e7bba..fd2cc613b 100644
--- a/src/platform/redox/path.rs
+++ b/src/platform/redox/path.rs
@@ -1,3 +1,4 @@
+use syscall::data::Stat;
use syscall::error::*;
use syscall::flag::*;
@@ -95,6 +96,13 @@ pub fn chdir(path: &str) -> Result<()> {
let canonicalized = canonicalize_using_cwd(cwd_guard.as_deref(), path).ok_or(Error::new(ENOENT))?;
+ let fd = syscall::open(&canonicalized, O_STAT | O_CLOEXEC)?;
+ let mut stat = Stat::default();
+ if syscall::fstat(fd, &mut stat).is_err() || (stat.st_mode & MODE_TYPE) != MODE_DIR {
+ return Err(Error::new(ENOTDIR));
+ }
+ let _ = syscall::close(fd);
+
*cwd_guard = Some(canonicalized.into_boxed_str());
// TODO: Check that the dir exists and is a directory.
--
GitLab