msvcrt: Handle try blocks inside current catch block in nested frame handler.

Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Handle try blocks inside current catch block in nested frame handler.
2d4b48a5 · Piotr Caban · Alexandre Julliard · 941e4f7e · 2d4b48a5
Commit 2d4b48a5 authored Mar 15, 2016 by Piotr Caban Committed by Alexandre Julliard Mar 16, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

except_i386.c dlls/msvcrt/except_i386.c +3 -0

No files found.
--- a/dlls/msvcrt/except_i386.c
+++ b/dlls/msvcrt/except_i386.c
@@ -461,6 +461,9 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame 
    {
        const tryblock_info *tryblock = &descr->tryblock[i];

+        /* only handle try blocks inside current catch block */
+        if (catch_frame && nested_trylevel > tryblock->start_level) continue;
+
        if (trylevel < tryblock->start_level) continue;
        if (trylevel > tryblock->end_level) continue;