ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix static analyzer warnings" am: 7176951b9b

Browse source 
am: 34abe0cf5c

Change-Id: I1472b8624576dd8790b3d975b338c6597b4dd553
This commit is contained in:
George Burgess IV 2017-09-13 23:12:20 +00:00 • committed by android-build-merger
commit 7f7d002bb1
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libmemunreachable/tests/DisableMalloc_test.cpp
View file

@ -73,15 +73,18 @@ TEST_F(DisableMallocTest, deadlock_allocate) {
TEST_F(DisableMallocTest, deadlock_new) {
ASSERT_DEATH(
{
char* ptr = new (char);
// C++ allows `new Foo` to be replaced with a stack allocation or merged
// with future `new Foo` expressions, provided certain conditions are
// met [expr.new/10]. None of this applies to `operator new(size_t)`.
void* ptr = ::operator new(1);
ASSERT_NE(ptr, nullptr);
delete (ptr);
::operator delete(ptr);
{
alarm(100ms);
ScopedDisableMalloc disable_malloc;
char* ptr = new (std::nothrow)(char);
void* ptr = ::operator new(1);
ASSERT_NE(ptr, nullptr);
delete (ptr);
::operator delete(ptr);
}
},
"");
@ -90,14 +93,12 @@ TEST_F(DisableMallocTest, deadlock_new) {
TEST_F(DisableMallocTest, deadlock_delete) {
ASSERT_DEATH(
{
char* ptr = new (char);
void* ptr = ::operator new(1);
ASSERT_NE(ptr, nullptr);
{
alarm(250ms);
ScopedDisableMalloc disable_malloc;
delete (ptr);
// Force ptr usage or this code gets optimized away by the arm64 compiler.
ASSERT_NE(ptr, nullptr);
::operator delete(ptr);
}
},
"");