extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-04-03 06:01:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Close find handle in ls windows unsafe code (#15314)

Browse Source 
While inspecting the Windows specific code of `ls` for #15311 I stumbled
upon an unrelated issue in the alternate metadata gathering on Windows
(added by #5703).

The handle created by performing `FindFirstFileW` was never closed,
leading to a potential leak. Fixed by running `FindClose` as soon as the
operation succeeds.

https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-findfirstfilew#remarks
This commit is contained in:
Stefan Holderbach 2025-03-16 16:33:36 +01:00 committed by GitHub
parent 42aa2ff5ba
commit 1dd861b10f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crates/nu-command/src/filesystem/ls.rs
View File

@ -802,7 +802,7 @@ mod windows_helper {
use std::os::windows::prelude::OsStrExt;
use windows::Win32::Foundation::FILETIME;
use windows::Win32::Storage::FileSystem::{
FindFirstFileW, FILE_ATTRIBUTE_DIRECTORY, FILE_ATTRIBUTE_READONLY,
FindClose, FindFirstFileW, FILE_ATTRIBUTE_DIRECTORY, FILE_ATTRIBUTE_READONLY,
FILE_ATTRIBUTE_REPARSE_POINT, WIN32_FIND_DATAW,
};
use windows::Win32::System::SystemServices::{
@ -925,7 +925,14 @@ mod windows_helper {
windows::core::PCWSTR(filename_wide.as_ptr()),
&mut find_data,
) {
Ok(_) => Ok(find_data),
Ok(handle) => {
// Don't forget to close the Find handle
// https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-findfirstfilew#remarks
// Assumption: WIN32_FIND_DATAW is a pure data struct, so we can let our
// find_data outlive the handle.
let _ = FindClose(handle);
Ok(find_data)
}
Err(e) => Err(ShellError::Io(IoError::new_with_additional_context(
std::io::ErrorKind::Other,
span,