Changeset 21382 for trunk/src

Timestamp:

Jul 5, 2010, 3:13:08 PM (15 years ago)

Author:

dmik

Message:

SEH: Fixed: Nested try/except statements would produce wrong execution flow.

File:

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

trunk/src/kernel32/seh/sehutil.s

@@ -47 +47 @@
 
     movl 12(%ebp), %ebx
-    movl $0f, %eax
-    movl %eax, 12(%ebx) /* pFrame->pHandlerCallback */
+    movl $0f, 12(%ebx) /* pFrame->pHandlerCallback */
 
     /* get the size of the handler's stack */
@@ -86 +85 @@
 
     /* jump to the filter callback */
+    movl $1, 56(%eax) /* pFrame->state */
     jmp *8(%eax) /* pFrame->pFilterCallback */
 
@@ -110 +110 @@
 
     /* analyze filter result */
-    movl 20(%ebx), %eax
+    movl 20(%ebx), %eax /* pFrame->filterResult */
     cmpl $1, %eax /* EXCEPTION_EXECUTE_HANDLER? */
     je ___seh_handler_Unwind
@@ -141 +141 @@
     addl $12, %esp
 
-    /* restore __try/__catch context */
+    /* restore __try/__except context */
     movl 12(%ebp), %eax
     movl 24(%eax), %ebx
@@ -149 +149 @@
     movl 40(%eax), %esp
 
-    /* jump to __catch */
+    /* jump to __except */
+    movl $2, 56(%eax) /* pFrame->state */
     jmp *8(%eax) /* pFrame->pFilterCallback */