commit a078c0780c256e60bb31258c156ef2c507fb2da7
author Chris Forbes <chrisforbes@google.com> Tue May 16 19:39:41 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 16 19:39:41 2017 +0000
tree 6897deae1b5d9fd234c8bb369ae9e6b8d3ec44fd
parent 146f77fc3cb349ce78788acbc2cc518a7b7ce676
parent ce069c5a07c7f370b715b94af64a2a3c6c1f4e6f

Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am: 71d3ef1340 am: 5c5ee81b0c am: 05df3a6f4d am: 81bab8081e am: 209ad9b6fe am: d4cbd296d6 am: 593a1a217a am: e3bc28ad88 am: 600e610344
am: ce069c5a07

Change-Id: Ic185b2a7c35ea0260d5380d606f6b7b82c78b717

libs/ui/Fence.cpp

diff --git a/libs/ui/Fence.cpp b/libs/ui/Fence.cpp
index bf24ffb..1b2f34d 100644
--- a/libs/ui/Fence.cpp
+++ b/libs/ui/Fence.cpp
@@ -157,7 +157,7 @@
         return INVALID_OPERATION;
     }
 
-    if (size < 1) {
+    if (size < getFlattenedSize()) {
         return NO_MEMORY;
     }