tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix "Attempt to delete released memory" warning.

Browse source 
EXPECT_NONFATAL_FAILURE(statement, ...) expands to
  do {
    ... statement ...
  } while (::testing::internal::AlwaysFalse());

Clang analyzer cannot see into AlwaysFalse(),
and gives a false warning assuming that the
do loop can be done twice.

Use a unique_ptr::reset to call delete,
because reset can be called multiple times..

Bug: 259999410
Test: make tidy-system-core-fastboot_subset
Change-Id: Ie536f76635dd55f4e47b80eed6498fd1193b88ee
This commit is contained in:
Chih-Hung Hsieh 2022-12-01 17:52:50 -08:00
parent fa4926a9de
commit c76bc32d95
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
fastboot/socket_test.cpp
View file

@ -293,23 +293,23 @@ TEST(SocketMockTest, TestSendSuccess) {
}
TEST(SocketMockTest, TestSendFailure) {
SocketMock* mock = new SocketMock;
std::unique_ptr<SocketMock> mock(new SocketMock);
mock->ExpectSendFailure("foo");
EXPECT_FALSE(SendString(mock, "foo"));
EXPECT_FALSE(SendString(mock.get(), "foo"));
EXPECT_NONFATAL_FAILURE(SendString(mock, "foo"), "no message was expected");
EXPECT_NONFATAL_FAILURE(SendString(mock.get(), "foo"), "no message was expected");
mock->ExpectSend("foo");
EXPECT_NONFATAL_FAILURE(SendString(mock, "bar"), "expected foo, but got bar");
EXPECT_TRUE(SendString(mock, "foo"));
EXPECT_NONFATAL_FAILURE(SendString(mock.get(), "bar"), "expected foo, but got bar");
EXPECT_TRUE(SendString(mock.get(), "foo"));
mock->AddReceive("foo");
EXPECT_NONFATAL_FAILURE(SendString(mock, "foo"), "called out-of-order");
EXPECT_TRUE(ReceiveString(mock, "foo"));
EXPECT_NONFATAL_FAILURE(SendString(mock.get(), "foo"), "called out-of-order");
EXPECT_TRUE(ReceiveString(mock.get(), "foo"));
mock->ExpectSend("foo");
EXPECT_NONFATAL_FAILURE(delete mock, "1 event(s) were not handled");
EXPECT_NONFATAL_FAILURE(mock.reset(), "1 event(s) were not handled");
}
TEST(SocketMockTest, TestReceiveSuccess) {
@ -331,33 +331,33 @@ TEST(SocketMockTest, TestReceiveSuccess) {
}
TEST(SocketMockTest, TestReceiveFailure) {
SocketMock* mock = new SocketMock;
std::unique_ptr<SocketMock> mock(new SocketMock);
mock->AddReceiveFailure();
EXPECT_FALSE(ReceiveString(mock, "foo"));
EXPECT_FALSE(ReceiveString(mock.get(), "foo"));
EXPECT_FALSE(mock->ReceiveTimedOut());
mock->AddReceiveTimeout();
EXPECT_FALSE(ReceiveString(mock, "foo"));
EXPECT_FALSE(ReceiveString(mock.get(), "foo"));
EXPECT_TRUE(mock->ReceiveTimedOut());
mock->AddReceive("foo");
mock->AddReceiveFailure();
EXPECT_FALSE(ReceiveString(mock, "foobar"));
EXPECT_FALSE(ReceiveString(mock.get(), "foobar"));
EXPECT_NONFATAL_FAILURE(ReceiveString(mock, "foo"), "no message was ready");
EXPECT_NONFATAL_FAILURE(ReceiveString(mock.get(), "foo"), "no message was ready");
mock->ExpectSend("foo");
EXPECT_NONFATAL_FAILURE(ReceiveString(mock, "foo"), "called out-of-order");
EXPECT_TRUE(SendString(mock, "foo"));
EXPECT_NONFATAL_FAILURE(ReceiveString(mock.get(), "foo"), "called out-of-order");
EXPECT_TRUE(SendString(mock.get(), "foo"));
char c;
mock->AddReceive("foo");
EXPECT_NONFATAL_FAILURE(mock->Receive(&c, 1, 0), "not enough bytes (1) for foo");
EXPECT_TRUE(ReceiveString(mock, "foo"));
EXPECT_TRUE(ReceiveString(mock.get(), "foo"));
mock->AddReceive("foo");
EXPECT_NONFATAL_FAILURE(delete mock, "1 event(s) were not handled");
EXPECT_NONFATAL_FAILURE(mock.reset(), "1 event(s) were not handled");
}
TEST(SocketMockTest, TestAcceptSuccess) {
@ -372,14 +372,14 @@ TEST(SocketMockTest, TestAcceptSuccess) {
}
TEST(SocketMockTest, TestAcceptFailure) {
SocketMock* mock = new SocketMock;
std::unique_ptr<SocketMock> mock(new SocketMock);
EXPECT_NONFATAL_FAILURE(mock->Accept(), "no socket was ready");
mock->ExpectSend("foo");
EXPECT_NONFATAL_FAILURE(mock->Accept(), "called out-of-order");
EXPECT_TRUE(SendString(mock, "foo"));
EXPECT_TRUE(SendString(mock.get(), "foo"));
mock->AddAccept(nullptr);
EXPECT_NONFATAL_FAILURE(delete mock, "1 event(s) were not handled");
EXPECT_NONFATAL_FAILURE(mock.reset(), "1 event(s) were not handled");
}