msvcrt: Handle frames with CXX_FRAME_MAGIC_VC6 and CXX_FRAME_MAGIC_VC7 magic value.

Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> (cherry picked from commit 953d6c88) Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

msvcrt: Handle frames with CXX_FRAME_MAGIC_VC6 and CXX_FRAME_MAGIC_VC7 magic value.
da996311 · Piotr Caban · Michael Stefaniuc · 8d69049c · da996311
Commit da996311 authored Mar 28, 2016 by Piotr Caban Committed by Michael Stefaniuc May 31, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

except_x86_64.c dlls/msvcrt/except_x86_64.c +3 -1

No files found.
--- a/dlls/msvcrt/except_x86_64.c
+++ b/dlls/msvcrt/except_x86_64.c
@@ -160,7 +160,9 @@ static void dump_function_descr(const cxx_function_descr *descr, ULONG64 image_b
        }
    }
    TRACE("unwind_help %d\n", descr->unwind_help);
+    if (descr->magic <= CXX_FRAME_MAGIC_VC6) return;
    TRACE("expect list: %x\n", descr->expect_list);
+    if (descr->magic <= CXX_FRAME_MAGIC_VC7) return;
    TRACE("flags: %08x\n", descr->flags);
 }

@@ -170,7 +172,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame,
 {
    cxx_exception_type *exc_type;

-    if (descr->magic != CXX_FRAME_MAGIC_VC8)
+    if (descr->magic<CXX_FRAME_MAGIC_VC6 || descr->magic>CXX_FRAME_MAGIC_VC8)
    {
        FIXME("unhandled frame magic %x\n", descr->magic);
        return ExceptionContinueSearch;