From bdd4d5d8d8f81d114545857c6e5eddc8c96fcf7b Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Mon, 6 Jan 2020 00:56:20 +0100
Subject: [PATCH] [NTOS:KE:X64] Set the exception frame as well in
 KiInitializeContextThread

---
 ntoskrnl/ke/amd64/thrdini.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ntoskrnl/ke/amd64/thrdini.c b/ntoskrnl/ke/amd64/thrdini.c
index 6548a385651..71d4179843a 100644
--- a/ntoskrnl/ke/amd64/thrdini.c
+++ b/ntoskrnl/ke/amd64/thrdini.c
@@ -77,10 +77,11 @@ KiInitializeContextThread(IN PKTHREAD Thread,
 
         /* Zero out the trap frame */
         RtlZeroMemory(TrapFrame, sizeof(KTRAP_FRAME));
+        RtlZeroMemory(&InitFrame->ExceptionFrame, sizeof(KEXCEPTION_FRAME));
 
         /* Set up a trap frame from the context. */
         KeContextToTrapFrame(Context,
-                             NULL,
+                             &InitFrame->ExceptionFrame,
                              TrapFrame,
                              CONTEXT_AMD64 | ContextFlags,
                              UserMode);