msvcrt: Handle non c++ exceptions in __DestructExceptionObject.

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

msvcrt: Handle non c++ exceptions in __DestructExceptionObject.
856f0f9d · Piotr Caban · Alexandre Julliard · 8fda75fe · 856f0f9d
Commit 856f0f9d authored Mar 18, 2016 by Piotr Caban Committed by Alexandre Julliard Mar 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

except.c dlls/msvcrt/except.c +9 -0

No files found.
--- a/dlls/msvcrt/except.c
+++ b/dlls/msvcrt/except.c
@@ -400,6 +400,15 @@ void CDECL __DestructExceptionObject(EXCEPTION_RECORD *rec)

    TRACE("(%p)\n", rec);

+    if (rec->ExceptionCode != CXX_EXCEPTION) return;
+#ifndef __x86_64__
+    if (rec->NumberParameters != 3) return;
+#else
+    if (rec->NumberParameters != 4) return;
+#endif
+    if (rec->ExceptionInformation[0] < CXX_FRAME_MAGIC_VC6 ||
+            rec->ExceptionInformation[0] > CXX_FRAME_MAGIC_VC8) return;
+
    if (!info || !info->destructor)
        return;