commit fcb6bdd64e05a8af0d35bc7b960efda8eb6ddfbb
author Dominic Chen <ddchen@apple.com> Fri Mar 25 22:46:58 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 25 22:46:58 2022 +0000
tree 54e712a9fc6a0a17786a834b68d4f3a0b70548c4
parent 79a44480f3afaecd02dbe05ec3756c4d3a42cfc4
parent 58033868c9086acfc50f3d018880f5e7df78ecfa

[scudo] Use nullptr instead of integer-to-pointer cast am: d1f799403b am: 94150297cd am: 58033868c9

Original change: https://android-review.googlesource.com/c/platform/external/scudo/+/2045287

Change-Id: I6c3ac27a87e1a4c035d8d11b6fb8ce20c07d893d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

standalone/combined.h

diff --git a/standalone/combined.h b/standalone/combined.h
index 371fb78..365720d 100644
--- a/standalone/combined.h
+++ b/standalone/combined.h
@@ -1271,8 +1271,8 @@
   }
 
   static const size_t NumErrorReports =
-      sizeof(((scudo_error_info *)0)->reports) /
-      sizeof(((scudo_error_info *)0)->reports[0]);
+      sizeof(((scudo_error_info *)nullptr)->reports) /
+      sizeof(((scudo_error_info *)nullptr)->reports[0]);
 
   static void getInlineErrorInfo(struct scudo_error_info *ErrorInfo,
                                  size_t &NextErrorReport, uintptr_t FaultAddr,