DragonOS-Community/DragonOS
1
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-09 19:36:47 +00:00
Code Issues Releases Wiki Activity

修复drop fd时，文件描述符引用不为0的问题 (#382)

Browse Source
This commit is contained in:
LoGin 2023-09-16 16:16:43 +08:00 committed by GitHub
parent de71ec259c
commit 71474bc682
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/src/filesystem/vfs/file.rs
View File

@ -503,11 +503,7 @@ impl FileDescriptorVec {
return Err(SystemError::EBADF); return Err(SystemError::EBADF);
} }
let f = self.get_file_by_fd(fd); self.get_file_by_fd(fd).ok_or(SystemError::EBADF)?;
if f.is_none() {
// 如果文件描述符不存在，报错
return Err(SystemError::EBADF);
}
// 把文件描述符数组对应位置设置为空 // 把文件描述符数组对应位置设置为空
let file = self.fds[fd as usize].take().unwrap(); let file = self.fds[fd as usize].take().unwrap();