commit eb576150d52a451f596a1e09fc06cee025a62a53
author Chris Forbes <chrisforbes@google.com> Tue May 16 19:52:13 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 16 19:52:13 2017 +0000
tree fc27062dcdbb7620891ae4b5940acafcbffbaa83
parent 42648b72164b9e54ca607699dd9438fcfa201d09
parent 161a9bcda121203de7c80923eba15ad69618247d

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 am: a078c0780c am: 1ceadac71b am: 912ff8af49
am: 161a9bcda1

Change-Id: I9461a64173a220e0d21a8b8d0ef537025936660b

libs/ui/Fence.cpp

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