summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chris Forbes <chrisforbes@google.com> 2017-05-16 19:24:11 +0000
committer android-build-merger <android-build-merger@google.com> 2017-05-16 19:24:11 +0000
commitd4cbd296d66d788fd1867d21cae3b4df37fe93b9 (patch)
tree9afa603c845b2361ade33526a9cc803a197a7716
parent2c86168b51c4d790b8fc6dfa3bd28f3450f36e47 (diff)
parent209ad9b6feb103eed399d446221bec59ccb8ce07 (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 Change-Id: I31fe784570c5978faf7484b3f71a074523c0d33c
-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 bf24ffb7e0..1b2f34dfa8 100644
--- a/libs/ui/Fence.cpp
+++ b/libs/ui/Fence.cpp
@@ -157,7 +157,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;
}