Changeset 21382 for trunk/include

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/include/excpt.h (modified) (3 diffs)

trunk/include/excpt.h

@@ -46 +46 @@
 #define __try \
     volatile __seh_PEXCEPTION_FRAME __seh_frame;                               \
-    for (__seh_frame.state = 0; __seh_frame.state <= 3; ++__seh_frame.state)   \
+    __seh_frame.state = 0;                                                     \
+    __asm__("\n0:\n"); /* pFilterCallback */                                   \
+    for (; __seh_frame.state <= 3; ++__seh_frame.state)                        \
         if (__seh_frame.state == 0)                                            \
         {                                                                      \
@@ -60 +62 @@
                      "movl $___seh_handler, %%eax; "                           \
                      "movl %%eax, 4(%%ecx); "                                  \
-                     "movl $0f, %%eax; "                                       \
-                     "movl %%eax, 8(%%ecx); "                                  \
+                     "movl $0b, 8(%%ecx); "                                    \
                      ""                                                        \
                      "movl %%ebx, 24(%%ecx); "                                 \
@@ -84 +85 @@
             }                                                                  \
             __seh_frame.state = 2;                                             \
-            __asm__("\n0:\n"); /* pFilterCallback */                           \
-            continue;                                                          \
         }                                                                      \
         else if (__seh_frame.state == 1) {                                     \