vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-glob-utf8' into 'master'

Browse Source 
fix: glob: handle non-UTF-8 paths without panicking

See merge request redox-os/relibc!1438
This commit is contained in:
Jeremy Soller
2026-06-08 06:45:12 -06:00
parent 11557957e0 18c1977f20
commit 944bd18772
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/header/glob/mod.rs
+7 -11
View File
@@ -228,22 +228,18 @@ fn list_dir(
true
} else if (*entry).d_type == DT_LNK {
// Resolve symbolic link
let mut full_path = path.to_owned_cstring().into_string().unwrap();
if !full_path.ends_with('/') {
full_path.push('/');
let mut full_path = path.to_bytes().to_vec();
if !full_path.ends_with(b"/") {
full_path.push(b'/');
}
full_path.push_str(name.to_str().unwrap());
full_path.push('\0');
full_path.extend_from_slice(name.as_bytes());
let full_path = CString::new(full_path).unwrap();
let mut link_info = stat::default();
if stat(
full_path.as_ptr().cast::<c_char>(),
ptr::from_mut(&mut link_info),
) != 0
{
if stat(full_path.as_ptr(), ptr::from_mut(&mut link_info)) != 0 {
let errno = platform::ERRNO.get();
platform::ERRNO.set(old_errno);
if errfunc(full_path.as_ptr().cast::<c_char>(), errno) != 0 || abort_on_error {
if errfunc(full_path.as_ptr(), errno) != 0 || abort_on_error {
return Err(GLOB_ABORTED);
}
}