Throw if an invalid handle passed to CloseHandle

rust-lang · Nov 6, 2024 · 37900dc · 37900dc
1 parent bfc5234
commit 37900dc
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/src/shims/windows/handle.rs b/src/shims/windows/handle.rs
@@ -160,15 +160,11 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
         let handle = this.read_scalar(handle_op)?;
         let ret = match Handle::from_scalar(handle, this)? {
             Some(Handle::Thread(thread)) => {
-                match this.thread_id_try_from(thread) {
-                    Ok(thread) => {
-                        this.detach_thread(thread, /*allow_terminated_joined*/ true)?;
-                        this.eval_windows("c", "TRUE")
-                    }
-                    Err(_) => {
-                        this.set_last_error(this.eval_windows("c", "ERROR_INVALID_HANDLE"))?;
-                        this.eval_windows("c", "FALSE")
-                    }
+                if let Ok(thread) = this.thread_id_try_from(thread) {
+                    this.detach_thread(thread, /*allow_terminated_joined*/ true)?;
+                    this.eval_windows("c", "TRUE")
+                } else {
+                    this.invalid_handle("CloseHandle")?
                 }
             }
             _ => this.invalid_handle("CloseHandle")?,