Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5373fb20 authored by Mitch Phillips's avatar Mitch Phillips Committed by Automerger Merge Worker
Browse files

Merge "[GWP-ASan] Update metadata field name." am: 3e01373d am: 94427fed am: 3fcbad20 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1582536

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33d17f636bd74c7a13fb5bd2f4ddcb575ac1d9fa
parents c764ed8f 3fcbad20

debuggerd/libdebuggerd/test/tombstone_test.cpp

+6 −6
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ public: 
TEST_F(TombstoneTest, gwp_asan_cause_uaf_exact) {

  gwp_asan::AllocationMetadata meta;

  meta.Addr = 0x1000;

  meta.Size = 32;

  meta.RequestedSize = 32;



  GwpAsanCrashDataTest crash_data(gwp_asan::Error::USE_AFTER_FREE, &meta);

  crash_data.SetCrashAddress(0x1000);
@@ -396,7 +396,7 @@ TEST_F(TombstoneTest, gwp_asan_cause_uaf_exact) { 
TEST_F(TombstoneTest, gwp_asan_cause_double_free) {

  gwp_asan::AllocationMetadata meta;

  meta.Addr = 0x1000;

  meta.Size = 32;

  meta.RequestedSize = 32;



  GwpAsanCrashDataTest crash_data(gwp_asan::Error::DOUBLE_FREE, &meta);

  crash_data.SetCrashAddress(0x1000);
@@ -413,7 +413,7 @@ TEST_F(TombstoneTest, gwp_asan_cause_double_free) { 
TEST_F(TombstoneTest, gwp_asan_cause_overflow) {

  gwp_asan::AllocationMetadata meta;

  meta.Addr = 0x1000;

  meta.Size = 32;

  meta.RequestedSize = 32;



  GwpAsanCrashDataTest crash_data(gwp_asan::Error::BUFFER_OVERFLOW, &meta);

  crash_data.SetCrashAddress(0x1025);
@@ -432,7 +432,7 @@ TEST_F(TombstoneTest, gwp_asan_cause_overflow) { 
TEST_F(TombstoneTest, gwp_asan_cause_underflow) {

  gwp_asan::AllocationMetadata meta;

  meta.Addr = 0x1000;

  meta.Size = 32;

  meta.RequestedSize = 32;



  GwpAsanCrashDataTest crash_data(gwp_asan::Error::BUFFER_UNDERFLOW, &meta);

  crash_data.SetCrashAddress(0xffe);
@@ -451,7 +451,7 @@ TEST_F(TombstoneTest, gwp_asan_cause_underflow) { 
TEST_F(TombstoneTest, gwp_asan_cause_invalid_free_inside) {

  gwp_asan::AllocationMetadata meta;

  meta.Addr = 0x1000;

  meta.Size = 32;

  meta.RequestedSize = 32;



  GwpAsanCrashDataTest crash_data(gwp_asan::Error::INVALID_FREE, &meta);

  crash_data.SetCrashAddress(0x1001);
@@ -470,7 +470,7 @@ TEST_F(TombstoneTest, gwp_asan_cause_invalid_free_inside) { 
TEST_F(TombstoneTest, gwp_asan_cause_invalid_free_outside) {

  gwp_asan::AllocationMetadata meta;

  meta.Addr = 0x1000;

  meta.Size = 32;

  meta.RequestedSize = 32;



  GwpAsanCrashDataTest crash_data(gwp_asan::Error::INVALID_FREE, &meta);

  crash_data.SetCrashAddress(0x1021);