commit 85a076b8bd5e8a3f1376a31eadd2bc220a4c454b
author Vitaly Buka <vitalybuka@google.com> Wed Jun 30 14:42:41 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Jul 15 20:03:55 2021 -0700
tree f9089c69333a9008abc57e1df132bfad6497471b
parent ac2a73b45d526b71d9d308523fe3da1778dc38f6

[scudo] GWP_ASAN runs on untagged pointers

It's already covered by multiple tests, but to trigger
this path we need MTE+GWP which disabled.

Reviewed By: hctim, pcc

Differential Revision: https://reviews.llvm.org/D105232

GitOrigin-RevId: b1fd009aab4bfe4f16bd78b7ac779c3f665ae060

combined.h

diff --git a/combined.h b/combined.h
index 079edab..e8bb8bf 100644
--- a/combined.h
+++ b/combined.h
@@ -569,9 +569,6 @@
       reportAllocationSizeTooBig(NewSize, 0, MaxAllowedMallocSize);
     }
 
-    void *OldTaggedPtr = OldPtr;
-    OldPtr = getHeaderTaggedPointer(OldPtr);
-
     // The following cases are handled by the C wrappers.
     DCHECK_NE(OldPtr, nullptr);
     DCHECK_NE(NewSize, 0);
@@ -591,6 +588,9 @@
     }
 #endif // GWP_ASAN_HOOKS
 
+    void *OldTaggedPtr = OldPtr;
+    OldPtr = getHeaderTaggedPointer(OldPtr);
+
     if (UNLIKELY(!isAligned(reinterpret_cast<uptr>(OldPtr), MinAlignment)))
       reportMisalignedPointer(AllocatorAction::Reallocating, OldPtr);