commit 4f217ce217421e36381067cbabe615223c3a0a3e
author Tapani Pälli <tapani.palli@intel.com> Mon Dec 09 09:37:27 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Dec 09 09:37:27 2019 -0800
tree 9c316cdaf4fff69f60b0cbd78b02c30e41a0c65b
parent 03babeec31c7b3b1ae1523bd4cbd481acf20b381
parent 05a255c8c2043a339e697a06daf321a1e9bb31dc

Merge "libui: use uint64_t in dump and getTotalSize to avoid overflow issues" am: 8fc7c37cfd
am: 05a255c8c2

Change-Id: I4d1865fb6feccaa656e334dc5be4f1b041e7f562

libs/ui/GraphicBufferAllocator.cpp

diff --git a/libs/ui/GraphicBufferAllocator.cpp b/libs/ui/GraphicBufferAllocator.cpp
index d02bb94..b54ce0f 100644
--- a/libs/ui/GraphicBufferAllocator.cpp
+++ b/libs/ui/GraphicBufferAllocator.cpp
@@ -61,9 +61,9 @@
 
 GraphicBufferAllocator::~GraphicBufferAllocator() {}
 
-size_t GraphicBufferAllocator::getTotalSize() const {
+uint64_t GraphicBufferAllocator::getTotalSize() const {
     Mutex::Autolock _l(sLock);
-    size_t total = 0;
+    uint64_t total = 0;
     for (size_t i = 0; i < sAllocList.size(); ++i) {
         total += sAllocList.valueAt(i).size;
     }
@@ -73,7 +73,7 @@
 void GraphicBufferAllocator::dump(std::string& result) const {
     Mutex::Autolock _l(sLock);
     KeyedVector<buffer_handle_t, alloc_rec_t>& list(sAllocList);
-    size_t total = 0;
+    uint64_t total = 0;
     result.append("Allocated buffers:\n");
     const size_t c = list.size();
     for (size_t i=0 ; i<c ; i++) {

libs/ui/include/ui/GraphicBufferAllocator.h

diff --git a/libs/ui/include/ui/GraphicBufferAllocator.h b/libs/ui/include/ui/GraphicBufferAllocator.h
index 324d9e1..0635727 100644
--- a/libs/ui/include/ui/GraphicBufferAllocator.h
+++ b/libs/ui/include/ui/GraphicBufferAllocator.h
@@ -49,7 +49,7 @@
 
     status_t free(buffer_handle_t handle);
 
-    size_t getTotalSize() const;
+    uint64_t getTotalSize() const;
 
     void dump(std::string& res) const;
     static void dumpToSystemLog();