ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-04 06:38:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[os2/file]: Fixes related to handle inheritance

Browse Source 
All file handles created on Windows used to be made
non-inheritable, by forcing the .Close_On_Exec flag
in _open() function. In addition, there was an
issue with security descriptor being freed before
use, which has been fixed.
This commit is contained in:
flysand7
2024-07-14 15:06:28 +11:00
parent e715674512
commit b686b072d5
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/os/os2/file_windows.odin
+6 -8
View File
@@ -75,11 +75,9 @@ _open_internal :: proc(name: string, flags: File_Flags, perm: File_Mode) -> (han
access |= win32.FILE_APPEND_DATA access |= win32.FILE_APPEND_DATA
} }
share_mode := u32(win32.FILE_SHARE_READ | win32.FILE_SHARE_WRITE) share_mode := u32(win32.FILE_SHARE_READ | win32.FILE_SHARE_WRITE)
sa: ^win32.SECURITY_ATTRIBUTES sa := win32.SECURITY_ATTRIBUTES {
if .Close_On_Exec not_in flags { nLength = size_of(win32.SECURITY_ATTRIBUTES),
sa = &win32.SECURITY_ATTRIBUTES{} bInheritHandle = .Close_On_Exec not_in flags,
sa.nLength = size_of(win32.SECURITY_ATTRIBUTES)
sa.bInheritHandle = true
} }
create_mode: u32 = win32.OPEN_EXISTING create_mode: u32 = win32.OPEN_EXISTING
@@ -101,7 +99,7 @@ _open_internal :: proc(name: string, flags: File_Flags, perm: File_Mode) -> (han
// NOTE(bill): Open has just asked to create a file in read-only mode. // NOTE(bill): Open has just asked to create a file in read-only mode.
// If the file already exists, to make it akin to a *nix open call, // If the file already exists, to make it akin to a *nix open call,
// the call preserves the existing permissions. // the call preserves the existing permissions.
h := win32.CreateFileW(path, access, share_mode, sa, win32.TRUNCATE_EXISTING, win32.FILE_ATTRIBUTE_NORMAL, nil) h := win32.CreateFileW(path, access, share_mode, &sa, win32.TRUNCATE_EXISTING, win32.FILE_ATTRIBUTE_NORMAL, nil)
if h == win32.INVALID_HANDLE { if h == win32.INVALID_HANDLE {
switch e := win32.GetLastError(); e { switch e := win32.GetLastError(); e {
case win32.ERROR_FILE_NOT_FOUND, _ERROR_BAD_NETPATH, win32.ERROR_PATH_NOT_FOUND: case win32.ERROR_FILE_NOT_FOUND, _ERROR_BAD_NETPATH, win32.ERROR_PATH_NOT_FOUND:
@@ -114,7 +112,7 @@ _open_internal :: proc(name: string, flags: File_Flags, perm: File_Mode) -> (han
} }
} }
} }
h := win32.CreateFileW(path, access, share_mode, sa, create_mode, attrs, nil) h := win32.CreateFileW(path, access, share_mode, &sa, create_mode, attrs, nil)
if h == win32.INVALID_HANDLE { if h == win32.INVALID_HANDLE {
return 0, _get_platform_error() return 0, _get_platform_error()
} }
@@ -124,7 +122,7 @@ _open_internal :: proc(name: string, flags: File_Flags, perm: File_Mode) -> (han
_open :: proc(name: string, flags: File_Flags, perm: File_Mode) -> (f: ^File, err: Error) { _open :: proc(name: string, flags: File_Flags, perm: File_Mode) -> (f: ^File, err: Error) {
flags := flags if flags != nil else {.Read} flags := flags if flags != nil else {.Read}
handle := _open_internal(name, flags + {.Close_On_Exec}, perm) or_return handle := _open_internal(name, flags, perm) or_return
return _new_file(handle, name), nil return _new_file(handle, name), nil
} }