Changeset 21618 for trunk/src/kernel32/exceptions.cpp

Timestamp:

Apr 15, 2011, 2:47:32 AM (14 years ago)

Author:

dmik

Message:

kernel32/SEH: Fixed a couple of bugs in SEH processing that could cause a bunch of various crashes when unwinding the Win32 exception chain (usually at process termination, as a result of both a fatal exception or a clean exit).

File:

• trunk/src/kernel32/exceptions.cpp (modified) (12 diffs)

trunk/src/kernel32/exceptions.cpp

@@ -114 +114 @@
 void KillWin32Process(void);
 
-static void sprintfException(PEXCEPTIONREPORTRECORD pERepRec, PEXCEPTIONREGISTRATIONRECORD pERegRec, PCONTEXTRECORD pCtxRec, PVOID p, PSZ szTrapDump);
+static void sprintfException(PEXCEPTIONREPORTRECORD pERepRec,
+                             PEXCEPTIONREGISTRATIONRECORD pERegRec,
+                             PCONTEXTRECORD pCtxRec, PVOID p, PSZ szTrapDump);
+
+extern "C"
+int __cdecl __seh_handler(PWINEXCEPTION_RECORD pRec,
+                          PWINEXCEPTION_FRAME pFrame,
+                          PCONTEXTRECORD pContext, PVOID pVoid);
+
+extern "C"
+PWINEXCEPTION_FRAME __cdecl __seh_get_prev_frame(PWINEXCEPTION_FRAME pFrame);
 
 #ifdef DEBUG
-void PrintWin32ExceptionChain(PWINEXCEPTION_FRAME pframe);
+static void PrintWin32ExceptionChain(PWINEXCEPTION_FRAME pframe);
 #else
 #define PrintWin32ExceptionChain(a)
@@ -335 +345 @@
 DWORD RtlDispatchException(WINEXCEPTION_RECORD *pRecord, WINCONTEXT *pContext)
 {
-  PWINEXCEPTION_FRAME   pFrame, dispatch, nested_frame;
-  int                   rc;
-
-  // get chain of exception frames
-  rc  = ExceptionContinueSearch;
-
-  nested_frame = NULL;
-  TEB *winteb = GetThreadTEB();
-  pFrame      = (PWINEXCEPTION_FRAME)winteb->except;
-
-  dprintf(("KERNEL32: RtlDispatchException entered"));
-
-  PrintWin32ExceptionChain(pFrame);
-
-  // walk the exception chain
-  while( (pFrame != NULL) && ((ULONG)((ULONG)pFrame & 0xFFFFF000) != 0xFFFFF000) )
-  {
-        dprintf(("KERNEL32: RtlDispatchException - pframe=%08X, pframe->Prev=%08X", pFrame, pFrame->Prev));
-        if (pFrame == pFrame->Prev) {
+    PWINEXCEPTION_FRAME   pFrame, pPrevFrame, dispatch, nested_frame;
+    int                   rc;
+
+    // get chain of exception frames
+    rc  = ExceptionContinueSearch;
+
+    nested_frame = NULL;
+    TEB *winteb = GetThreadTEB();
+    pFrame      = (PWINEXCEPTION_FRAME)winteb->except;
+
+    dprintf(("KERNEL32: RtlDispatchException entered"));
+
+    PrintWin32ExceptionChain(pFrame);
+
+    // walk the exception chain
+    while( (pFrame != NULL) && ((ULONG)((ULONG)pFrame & 0xFFFFF000) != 0xFFFFF000) )
+    {
+        pPrevFrame = __seh_get_prev_frame(pFrame);
+
+        dprintf(("KERNEL32: RtlDispatchException - pframe=%08X, pframe->Prev=%08X",
+                 pFrame, pPrevFrame));
+        if (pFrame == pPrevFrame) {
             dprintf(("KERNEL32: RtlDispatchException - Invalid exception frame!!"));
             return 0;
@@ -374 +387 @@
 
         /* call handler */
-        if(pFrame->Handler) {
-            rc = EXC_CallHandler(pRecord, pFrame, pContext, &dispatch, pFrame->Handler, EXC_RaiseHandler );
-        }
-        else {
+        if (pFrame->Handler)
+        {
+            rc = EXC_CallHandler(pRecord, pFrame, pContext, &dispatch,
+                                 pFrame->Handler, EXC_RaiseHandler);
+        }
+        else
+        {
             dprintf(("pFrame->Handler is NULL!!!!!"));
             rc = ExceptionContinueSearch;
@@ -395 +411 @@
         {
         case ExceptionContinueExecution:
-            if (!(pRecord->ExceptionFlags & EH_NONCONTINUABLE)) {
+            if (!(pRecord->ExceptionFlags & EH_NONCONTINUABLE))
+            {
                 dprintf(("KERNEL32: RtlDispatchException returns %#x (ContinueExecution)", rc));
                 return rc;
@@ -410 +427 @@
         }
 
-        dprintf(("KERNEL32: RtlDispatchException - going from frame %08X to previous frame %08X", pFrame, pFrame->Prev));
-        if (pFrame == pFrame->Prev) {
+        dprintf(("KERNEL32: RtlDispatchException - going from frame %08X to previous frame %08X",
+                 pFrame, pPrevFrame));
+        if (pFrame == pPrevFrame)
+        {
             dprintf(("KERNEL32: RtlDispatchException - Invalid exception frame!!"));
             break;
         }
-        pFrame = pFrame->Prev;
+        pFrame = pPrevFrame;
   }
   dprintf(("KERNEL32: RtlDispatchException returns %#x", rc));
@@ -442 +461 @@
                          DWORD es,  DWORD fs,   DWORD gs,  DWORD ss)
 {
-  PWINEXCEPTION_FRAME frame, dispatch;
+  PWINEXCEPTION_FRAME frame, prevFrame, dispatch;
   WINEXCEPTION_RECORD record, newrec;
   WINCONTEXT          context;
@@ -492 +511 @@
   while (((ULONG)((ULONG)frame & 0xFFFFF000) != 0xFFFFF000) && (frame != pEndFrame))
   {
+        prevFrame = __seh_get_prev_frame(frame);
+
         /* Check frame address */
         if (pEndFrame && (frame > pEndFrame))
@@ -499 +520 @@
             newrec.ExceptionRecord  = pRecord;
             newrec.NumberParameters = 0;
-            dprintf(("KERNEL32: RtlUnwind terminating thread.\n"));
+            dprintf(("KERNEL32: RtlUnwind terminating thread (invalid target).\n"));
             DosExit(EXIT_THREAD, 0);
         }
@@ -510 +531 @@
             newrec.ExceptionRecord  = pRecord;
             newrec.NumberParameters = 0;
-            dprintf(("KERNEL32: RtlUnwind terminating thread.\n"));
+            dprintf(("KERNEL32: RtlUnwind terminating thread (bad stack).\n"));
             DosExit(EXIT_THREAD, 0);
         }
@@ -540 +561 @@
             break;
         }
-        dprintf(("KERNEL32: RtlUnwind (before)- frame=%08X, frame->Prev=%08X", frame, frame->Prev));
-        SetExceptionChain((DWORD)frame->Prev);
-        frame = frame->Prev;
+        dprintf(("KERNEL32: RtlUnwind (before)- frame=%08X, frame->Prev=%08X", frame, prevFrame));
+        SetExceptionChain((DWORD)prevFrame);
+        frame = prevFrame;
         dprintf(("KERNEL32: RtlUnwind (after) - frame=%08X, frame->Prev=%08X", frame,
-                 ((ULONG)((ULONG)frame & 0xFFFFF000) != 0xFFFFF000) ? frame->Prev : (void*)0xFFFFFFFF));
+                 ((ULONG)((ULONG)frame & 0xFFFFF000) != 0xFFFFF000) ?
+                 __seh_get_prev_frame(frame->Prev) : (void*)0xFFFFFFFF));
   }
 
@@ -1237 +1259 @@
     case XCPT_PROCESS_TERMINATE:
     case XCPT_ASYNC_PROCESS_TERMINATE:
-////        dprintfException(pERepRec, pERegRec, pCtxRec, p);
+#if 0
+        dprintfException(pERepRec, pERegRec, pCtxRec, p);
+        PrintExceptionChain();
+#endif
         SetExceptionChain((ULONG)-1);
         goto continuesearch;
@@ -1811 +1836 @@
 //*****************************************************************************
 //*****************************************************************************
-void PrintWin32ExceptionChain(PWINEXCEPTION_FRAME pframe)
-{
-  dprintf(("Win32 exception chain:"));
-  while ((pframe != NULL) && ((ULONG)pframe != 0xFFFFFFFF)) {
-        dprintf(("  Record at %08X, Prev at %08X, handler at %08X", pframe, pframe->Prev, pframe->Handler));
-        if (pframe == pframe->Prev) {
-            dprintf(("Chain corrupted! Record at %08X pointing to itself!", pframe));
-            break;
-        }
-        pframe = pframe->Prev;
-  }
-  dprintf(("END of Win32 exception chain."));
-}
-
-#endif
-
+void PrintWin32ExceptionChain(PWINEXCEPTION_FRAME pFrame)
+{
+    dprintf(("Win32 exception chain:"));
+    while ((pFrame != NULL) && ((ULONG)pFrame != 0xFFFFFFFF))
+    {
+        PWINEXCEPTION_FRAME pPrevFrame = __seh_get_prev_frame(pFrame);
+        dprintf(("  Record at %08X, Prev at %08X, handler at %08X%s",
+                 pFrame, pPrevFrame, pFrame->Handler,
+                 pFrame->Handler == (PEXCEPTION_HANDLER)__seh_handler ?
+                 " (SEH)" : ""));
+        if (pFrame == pPrevFrame)
+        {
+            dprintf(("Chain corrupted! Record at %08X pointing to itself!",
+                     pFrame));
+            break;
+        }
+        pFrame = pPrevFrame;
+    }
+    dprintf(("END of Win32 exception chain."));
+}
+#endif
 
 /*****************************************************************************