From db97ea1fd077693049b3b30a702053a474f5c58b Mon Sep 17 00:00:00 2001 From: Justin Cohen Date: Thu, 14 Oct 2021 14:45:08 -0400 Subject: [PATCH] Fix errors in minidump_exception_mac and dwarf_cu_to_module_unittest Change-Id: I468f19048f6b48b230913e911d0da7a20d96cae8 Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/3222826 Reviewed-by: Mark Mentovai Reviewed-by: Nelson Billing --- src/common/dwarf_cu_to_module_unittest.cc | 2 +- src/google_breakpad/common/minidump_exception_mac.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/dwarf_cu_to_module_unittest.cc b/src/common/dwarf_cu_to_module_unittest.cc index cb943ae3..ce9f2da4 100644 --- a/src/common/dwarf_cu_to_module_unittest.cc +++ b/src/common/dwarf_cu_to_module_unittest.cc @@ -1570,7 +1570,7 @@ TEST_F(Specifications, InterCU) { vector functions; m.GetFunctions(&functions, functions.end()); EXPECT_EQ(1U, functions.size()); - EXPECT_STREQ("class_A::member_func_B", functions[0]->name.c_str()); + EXPECT_STREQ("class_A::member_func_B", functions[0]->name.str().c_str()); } TEST_F(Specifications, UnhandledInterCU) { diff --git a/src/google_breakpad/common/minidump_exception_mac.h b/src/google_breakpad/common/minidump_exception_mac.h index d5e59652..e53edc5d 100644 --- a/src/google_breakpad/common/minidump_exception_mac.h +++ b/src/google_breakpad/common/minidump_exception_mac.h @@ -67,7 +67,7 @@ typedef enum { /* EXC_MACH_SYSCALL */ MD_EXCEPTION_MAC_RPC_ALERT = 9, /* EXC_RPC_ALERT */ - MD_EXCEPTION_MAC_SIMULATED = 0x43507378 + MD_EXCEPTION_MAC_SIMULATED = 0x43507378, /* Fake exception code used by Crashpad's SimulateCrash ('CPsx'). */ MD_NS_EXCEPTION_SIMULATED = 0x43506E78 /* Fake exception code used by Crashpad's uncaught exceptions ('CPnx'). */