commit 968c9ccb9dc25ed864bd87f40551ebce7219c324
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Nov 06 22:11:44 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 06 22:11:44 2024 +0000
tree e672ae4bea149888887923e80384327655e4a9a3
parent 7d24e7e93dc4e1bed6dce4d2f5b74644e5dbeb4f
parent f4183a51c4ce2ec89b589215ce55d7907fe4b632

Merge "Fix native memory leak in Uint64ArrayRW" into main

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;
         }
     }