commit b2c3694aa2299c288601601ca6bcfe0cdef83698
author Lingfeng Yang <lfy@google.com> Fri Jan 22 20:39:08 2021 -0800
committer Joshua Duong <joshuaduong@google.com> Tue Sep 13 07:28:44 2022 -0700
tree f5819d713d641ca3981b3ac46ad1dd0aa960cf5f
parent da6a8ce57b30c4efc880a736f20f61759db9a7e7

[4/n] BumpPool: fix available size calc

Bug: 177241396
Change-Id: I7ed8958985bb2e2ca4e16d727c3b013a8f550fe4

base/BumpPool.h

diff --git a/base/BumpPool.h b/base/BumpPool.h
index e9fceee..302fa60 100644
--- a/base/BumpPool.h
+++ b/base/BumpPool.h
@@ -41,14 +41,14 @@
             sizeof(uint64_t) * ((wantedSize + sizeof(uint64_t) - 1) / (sizeof(uint64_t)));
 
         mTotalWantedThisGeneration += wantedSizeRoundedUp;
-        if (mAllocPos + wantedSizeRoundedUp > mStorage.size()) {
+        if (mAllocPos + wantedSizeRoundedUp > mStorage.size() * sizeof(uint64_t)) {
             mNeedRealloc = true;
             void* fallbackPtr = malloc(wantedSizeRoundedUp);
             mFallbackPtrs.insert(fallbackPtr);
             return fallbackPtr;
         }
-        size_t avail = mStorage.size() - mAllocPos;
-        void* allocPtr = (void*)(mStorage.data() + mAllocPos);
+        size_t avail = mStorage.size() * sizeof(uint64_t) - mAllocPos;
+        void* allocPtr = (void*)(((unsigned char*)mStorage.data()) + mAllocPos);
         mAllocPos += wantedSizeRoundedUp;
         return allocPtr;
     }