Fix FIFA17 SBC dispatch response-class check to capture live vtable

2026-08-18 20:51:55 +00:00
parent 1c7111ddbf
commit 35ceb084ef
2 changed files with 59 additions and 3 deletions
@@ -80,6 +80,7 @@ static TRACE_BASE: AtomicUsize = AtomicUsize::new(0);
 static DESERIALIZER_EXIT_M: AtomicUsize = AtomicUsize::new(0);
 static DESERIALIZER_EXIT_COUNT: AtomicUsize = AtomicUsize::new(0);
 static DESERIALIZER_EXIT_B_READY: AtomicUsize = AtomicUsize::new(usize::MAX);
+static DESERIALIZER_EXIT_RESPONSE_VTABLE: AtomicUsize = AtomicUsize::new(0);
 static NOTIFIER_TRAMPOLINE: AtomicUsize = AtomicUsize::new(0);
 static CONTROLLER_REGISTER_TRAMPOLINE: AtomicUsize = AtomicUsize::new(0);
 static NOTIFIER_ENTRIES: AtomicU64 = AtomicU64::new(0);
@@ -684,9 +685,11 @@ unsafe extern "system" fn deserializer_wrapper(this: *mut c_void, reader: *mut c
        .and_then(|slot| guarded_u8(slot))
        .map(usize::from)
        .unwrap_or(usize::MAX);
+    let response_vtable = guarded_usize(this as usize).unwrap_or(0);
    DESERIALIZER_EXIT_M.store(m, Ordering::Relaxed);
    DESERIALIZER_EXIT_COUNT.store(count, Ordering::Relaxed);
    DESERIALIZER_EXIT_B_READY.store(ready, Ordering::Relaxed);
+    DESERIALIZER_EXIT_RESPONSE_VTABLE.store(response_vtable, Ordering::Relaxed);
    DESERIALIZER_EXITS.fetch_add(1, Ordering::Release);
    result
 }
@@ -703,6 +706,7 @@ pub(crate) struct DispatchEvidence {
    pub(crate) deserializer_reader: usize,
    pub(crate) deserializer_result: bool,
    pub(crate) deserializer_thread: usize,
+    pub(crate) response_vtable: usize,
    pub(crate) model: usize,
    pub(crate) category_count: usize,
    pub(crate) notifier_entries: u64,
@@ -722,6 +726,7 @@ pub(crate) fn dispatch_evidence() -> DispatchEvidence {
        deserializer_reader: DESERIALIZER_LAST_READER.load(Ordering::Relaxed),
        deserializer_result: DESERIALIZER_LAST_RESULT.load(Ordering::Acquire),
        deserializer_thread: DESERIALIZER_LAST_THREAD.load(Ordering::Relaxed),
+        response_vtable: DESERIALIZER_EXIT_RESPONSE_VTABLE.load(Ordering::Relaxed),
        model: DESERIALIZER_EXIT_M.load(Ordering::Relaxed),
        category_count: DESERIALIZER_EXIT_COUNT.load(Ordering::Relaxed),
        notifier_entries: NOTIFIER_ENTRIES.load(Ordering::Acquire),