From f7a79d379a5de3def2bc306be50bd818995d1438 Mon Sep 17 00:00:00 2001 From: "Manikandan K. S." Date: Sat, 11 Jul 2026 19:24:32 +0530 Subject: [PATCH] Fix UB in gmock tests: add missing EXPECT_CALL before mock invocations gmock-actions_test.cc: Add EXPECT_CALL before DefaultValue check that previously invoked mock without expectation. gmock-matchers-arithmetic_test.cc: Add bare EXPECT_CALLs in AllArgsTest before mock methods that were called without expectations. --- googlemock/test/gmock-actions_test.cc | 1 + googlemock/test/gmock-matchers-arithmetic_test.cc | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc index 507db6b2..60469250 100644 --- a/googlemock/test/gmock-actions_test.cc +++ b/googlemock/test/gmock-actions_test.cc @@ -1859,6 +1859,7 @@ TEST(MockMethodTest, CanReturnMoveOnlyValue_Invoke) { // Check default value DefaultValue>::SetFactory( [] { return std::make_unique(42); }); + EXPECT_CALL(mock, MakeUnique()).WillOnce(DoDefault()); EXPECT_EQ(42, *mock.MakeUnique()); EXPECT_CALL(mock, MakeUnique()).WillRepeatedly(UniquePtrSource); diff --git a/googlemock/test/gmock-matchers-arithmetic_test.cc b/googlemock/test/gmock-matchers-arithmetic_test.cc index 65f8a5fc..defc059a 100644 --- a/googlemock/test/gmock-matchers-arithmetic_test.cc +++ b/googlemock/test/gmock-matchers-arithmetic_test.cc @@ -1182,6 +1182,10 @@ TEST(AllArgsTest, WorksWithoutMatchers) { ON_CALL(helper, OneArg).WillByDefault(Return(20)); ON_CALL(helper, TwoArgs).WillByDefault(Return(30)); + EXPECT_CALL(helper, NoArgs); + EXPECT_CALL(helper, OneArg); + EXPECT_CALL(helper, TwoArgs); + EXPECT_EQ(10, helper.NoArgs()); EXPECT_EQ(20, helper.OneArg(1)); EXPECT_EQ(30, helper.TwoArgs('\1', 2));