commit f4183a51c4ce2ec89b589215ce55d7907fe4b632
author Dmitri Plotnikov <dplotnikov@google.com> Wed Nov 06 12:54:24 2024 -0800
committer Dmitri Plotnikov <dplotnikov@google.com> Wed Nov 06 12:54:24 2024 -0800
tree e83a5bb9182516f5e38ee562350b493e44069048
parent 835351257e19a20115b979accc6e7bde1bf61fd6

Fix native memory leak in Uint64ArrayRW

Bug: 377547685
Test: adb shell dumpsys batterystats --usage; adb shell dumpsys -t 60 meminfo --unreachable `adb shell pidof system_server` | grep "unreachable allocations"
Flag: EXEMPT bugfix
Change-Id: I2287379427a8de732eda866dfcc3d4129dfb890d

libs/battery/LongArrayMultiStateCounter.cpp

diff --git a/libs/battery/LongArrayMultiStateCounter.cpp b/libs/battery/LongArrayMultiStateCounter.cpp
index 35c40ab..334d84b 100644
--- a/libs/battery/LongArrayMultiStateCounter.cpp
+++ b/libs/battery/LongArrayMultiStateCounter.cpp
@@ -46,9 +46,12 @@
     }
     if (mSize != 0) {
         if (t.data() != nullptr) {
-            mData = new uint64_t[mSize];
+            if (mData == nullptr) {
+                mData = new uint64_t[mSize];
+            }
             memcpy(mData, t.data(), mSize * sizeof(uint64_t));
         } else {
+            delete[] mData;
             mData = nullptr;
         }
     }