Skip to content

Fix missing error handling in SafeFileHandle.Type on Windows #126618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamsitnik merged 4 commits into from
Apr 8, 2026
+12 −0
Merged

Fix missing error handling in SafeFileHandle.Type on Windows #126618

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3b29fd2
Initial plan
Copilot Apr 7, 2026
2f83269
Add missing error handling in SafeFileHandle.GetFileTypeCore on Windows
Copilot Apr 7, 2026
275074d
Add cross-platform test for SafeFileHandle.Type with an invalid handle
Copilot Apr 7, 2026
c8d2aa7
Remove unreliable GetFileType_InvalidHandle_Throws test
Copilot Apr 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ...ibraries/System.Private.CoreLib/src/Microsoft/Win32/SafeHandles/SafeFileHandle.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,18 @@ internal FileHandleType GetFileTypeCore()
Debug.Assert(Path is null || _fileOptions != UninitializedOptions, "When Path is set, _fileOptions are also provided.");

int kernelFileType = Interop.Kernel32.GetFileType(this);
// GetFileType returns FILE_TYPE_UNKNOWN both when the type is unknown and when an error occurs.
// Check GetLastError to distinguish the two cases.
if (kernelFileType == Interop.Kernel32.FileTypes.FILE_TYPE_UNKNOWN)
{
int error = Marshal.GetLastPInvokeError();
if (error != Interop.Errors.ERROR_SUCCESS)
Comment thread
jkotas marked this conversation as resolved.
{
throw Win32Marshal.GetExceptionForWin32Error(error, Path);
}
return FileHandleType.Unknown;
Comment thread
jkotas marked this conversation as resolved.
}

return kernelFileType switch
{
Interop.Kernel32.FileTypes.FILE_TYPE_CHAR => FileHandleType.CharacterDevice,
Expand Down
Loading