summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChia-hung Duan <chiahungduan@google.com>2023-04-07 04:56:39 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-04-07 04:56:39 +0000
commit9ddc1a45b1c408b1db9ad79029f1d2bf3f61e557 (patch)
tree551b8d306f6530d4f4b6374bf54e637081ecfdba
parent318a80d9e1c235a54c279f82eb57fde432aa8fbb (diff)
parent23fd4d3ee35d404083d79b11340c608b3954bec0 (diff)
downloadscudo-9ddc1a45b1c408b1db9ad79029f1d2bf3f61e557.tar.gz
[scudo] Fix __require_constant_initialization__ on Android am: 8207106697 am: 9bc38e7a26 am: ad155dea86 am: 23fd4d3ee3
Original change: https://android-review.googlesource.com/c/platform/external/scudo/+/2528021 Change-Id: Ieff546ce8363a7759a0f14e3a4a0a7faaf4c6c45 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--standalone/secondary.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/standalone/secondary.h b/standalone/secondary.h
index e6a82db8cb3..935b48914d0 100644
--- a/standalone/secondary.h
+++ b/standalone/secondary.h
@@ -363,11 +363,11 @@ private:
}
struct CachedBlock {
- uptr CommitBase;
- uptr CommitSize;
- uptr BlockBegin;
- MemMapT MemMap;
- u64 Time;
+ uptr CommitBase = 0;
+ uptr CommitSize = 0;
+ uptr BlockBegin = 0;
+ MemMapT MemMap = {};
+ u64 Time = 0;
};
void releaseIfOlderThan(CachedBlock &Entry, u64 Time) REQUIRES(Mutex) {