Index: client/crashpad_info.cc |
diff --git a/client/crashpad_info.cc b/client/crashpad_info.cc |
index 977ea92dd31a8fcd36241b65a98fc478e93c02fc..49221784d91c8f4aa2b88be188099ecae9c3465b 100644 |
--- a/client/crashpad_info.cc |
+++ b/client/crashpad_info.cc |
@@ -66,7 +66,17 @@ union Compile_Assert { |
// from being dead-stripped. |
__attribute__((section(SEG_DATA ",__crashpad_info"), |
used, |
- visibility("hidden"))) CrashpadInfo g_crashpad_info; |
+ visibility("hidden") |
+#if __has_feature(address_sanitizer) |
+// AddressSanitizer would add a trailing red zone of at least 32 bytes, which |
+// would be reflected in the size of the custom section. This confuses |
+// MachOImageReader::GetCrashpadInfo(), which finds that the section’s size |
+// disagrees with the structure’s size_ field. By specifying an alignment |
+// greater than the red zone size, the red zone will be suppressed. |
+ , |
+ aligned(64) |
+#endif |
+ )) CrashpadInfo g_crashpad_info; |
#elif defined(OS_WIN) |