[PATCH 0/1] MR6340: vcruntime140_1: Handle empty catchblock type_info in validate_cxx_function_descr4.

[Piotr Caban (＠piotr)]

Fixes regression introduced by bc76e9cfe0bb7049407526ef220167dc2d726322.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6340

[PATCH 1/1] vcruntime140_1: Handle empty catchblock type_info in validate_cxx_function_descr4.

[Piotr Caban]

From: Piotr Caban <piotr(a)codeweavers.com>

Fixes regression introduced by bc76e9cfe0bb7049407526ef220167dc2d726322.
---
 dlls/msvcrt/handler4.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/msvcrt/handler4.c b/dlls/msvcrt/handler4.c
index 8ffdbdbf063..3990668970b 100644
--- a/dlls/msvcrt/handler4.c
+++ b/dlls/msvcrt/handler4.c
@@ -287,7 +287,7 @@ static BOOL validate_cxx_function_descr4(const cxx_function_descr_v4 *descr, DIS
             TRACE("        %d: header 0x%x offset %d handler 0x%x "
                     "ret addr[0] %#x ret_addr[1] %#x type %#x %s\n", j, ci.header, ci.offset,
                     ci.handler, ci.ret_addr[0], ci.ret_addr[1], ci.type_info,
-                    dbgstr_type_info(rtti_rva(ci.type_info, image_base)));
+                    dbgstr_type_info(ci.type_info ? rtti_rva(ci.type_info, image_base) : NULL));
         }
     }
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6340