Merge "libui: use uint64_t in dump and getTotalSize to avoid overflow issues" (05a255c8) · Commits · e / os / platform_frameworks_native

libs/ui/GraphicBufferAllocator.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -61,9 +61,9 @@ GraphicBufferAllocator::GraphicBufferAllocator() : mMapper(GraphicBufferMapper::

		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 @@ size_t GraphicBufferAllocator::getTotalSize() const {
		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++) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ public:

		status_t free(buffer_handle_t handle);

		size_t getTotalSize() const;
		uint64_t getTotalSize() const;

		void dump(std::string& res) const;
		static void dumpToSystemLog();