commit 82fc86b84fc47f38c44508e9e4fb28a72d6b3195
author Bill Rassieur <rassb@google.com> Tue Dec 04 16:59:48 2018 +0000
committer Bill Rassieur <rassb@google.com> Tue Dec 04 16:59:48 2018 +0000
tree c793398f5c63dfbe258254bb50528c9ca1955f4f
parent 158cb89b1c49c0f110dc48fe2ef393a7248d0737
parent b2ccd5adc1645c574e6e84b19d937ae98bf277fb

Merge PQ1A.181205.006 from Pi-QPR1-Release into ToT for Pi-Platform release.\n\nBUG: 120448245

Change-Id: I667d0a7aaca2dd2f62938aa311ca291bbe4e45e7

libs/ui/GraphicBuffer.cpp

diff --git a/libs/ui/GraphicBuffer.cpp b/libs/ui/GraphicBuffer.cpp
index 254038b..7670ac6 100644
--- a/libs/ui/GraphicBuffer.cpp
+++ b/libs/ui/GraphicBuffer.cpp
@@ -377,6 +377,10 @@
 
 status_t GraphicBuffer::unflatten(
         void const*& buffer, size_t& size, int const*& fds, size_t& count) {
+    if (size < 12 * sizeof(int)) {
+        android_errorWriteLog(0x534e4554, "114223584");
+        return NO_MEMORY;
+    }
 
     int const* buf = static_cast<int const*>(buffer);