summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chris Forbes <chrisforbes@google.com> 2017-05-16 19:46:11 +0000
committer android-build-merger <android-build-merger@google.com> 2017-05-16 19:46:11 +0000
commit912ff8af49167529afd18d0c9d1da958a544b36b (patch)
tree37740685655d37cee831ffcf65bb45e48c954eab
parent380e1aa3e97d826062eff15e64cab82aedbb80c9 (diff)
parent1ceadac71b38debd2f69ab75bda01e8e0febd8bc (diff)
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 Change-Id: I89b2e528d27938fa6bae79b3e6baa8e89d7207dd
-rw-r--r--libs/ui/Fence.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ui/Fence.cpp b/libs/ui/Fence.cpp
index 7cf8233820..5531b238f9 100644
--- a/libs/ui/Fence.cpp
+++ b/libs/ui/Fence.cpp
@@ -162,7 +162,7 @@ status_t Fence::unflatten(void const*& buffer, size_t& size, int const*& fds, si
return INVALID_OPERATION;
}
- if (size < 1) {
+ if (size < getFlattenedSize()) {
return NO_MEMORY;
}