Changeset 21645 for trunk/src/kernel32/seh

Timestamp:

Jun 22, 2011, 11:43:22 PM (14 years ago)

Author:

dmik

Message:

kernel32: SEH: Fixed crashes at process termination (exceptions c0010001 and c0010002 in POPUPLOG.OS2) caused by attempting to unwind the Win32 exception chain twice, the second time after destroying the Win32 TEB block.

File:

• trunk/src/kernel32/seh/sehutil.s (modified) (2 diffs)

trunk/src/kernel32/seh/sehutil.s

@@ -76 +76 @@
     popl %fs
 
-    /* check if we could successfully switch to Win32 FS. A failure means the
-     * Win32 thread is about to exit and TIB has been already destroyed. */
-    movl (%esp), %ecx   /* (%esp) is OS/2 FS pushed above */
-    movl %fs, %eax
-    cmpw %cx, %ax
-    je ___seh_handler_Skip_Win32_Unwind
-
     pushl $0        /* DWORD (unused) */
     pushl $0        /* PEXCEPTION_RECORD */
@@ -89 +82 @@
     call _RtlUnwind@16 /* _stdcall, rtl, callee cleans stack */
 
-___seh_handler_Skip_Win32_Unwind:
     popl %fs