Skip to content

Handle TlsGetValue calls with invalid index #140

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
evmar merged 1 commit into from
Jan 10, 2026
+6 −1
Merged

Handle TlsGetValue calls with invalid index #140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion win32/dll/kernel32/src/thread.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use super::{KernelObject, get_state, peb_mut};
use memory::Extensions;
use std::{rc::Rc, sync::Arc};
use win32_system::{Event, System, memory::Memory};
use win32_winapi::{HANDLE, Str16};
use win32_winapi::{ERROR, HANDLE, Str16};

#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
pub struct HTHREADT;
Expand Down Expand Up @@ -178,6 +178,11 @@ pub fn TlsSetValue(sys: &mut dyn System, dwTlsIndex: u32, lpTlsValue: u32) -> bo
#[win32_derive::dllexport]
pub fn TlsGetValue(sys: &mut dyn System, dwTlsIndex: u32) -> u32 {
let teb = teb_mut(sys);
if dwTlsIndex as usize >= teb.TlsSlots.len() {
log::warn!("TlsGetValue of unknown slot {dwTlsIndex}");
sys.set_last_error(ERROR::INVALID_PARAMETER);
return 0;
}
teb.TlsSlots[dwTlsIndex as usize]
}

Expand Down
Loading