summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chris Forbes <chrisforbes@google.com> 2017-05-16 19:55:13 +0000
committer android-build-merger <android-build-merger@google.com> 2017-05-16 19:55:13 +0000
commit8f47ce8194f80092a08b1e36475b2695280688eb (patch)
tree6c2aad2c214a8cd9fff002e87d8d66f5684c139d
parentc0e6fa641bc5eb749dd94fc40b0a79070fd14ca7 (diff)
parenteb576150d52a451f596a1e09fc06cee025a62a53 (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 am: 912ff8af49 am: 161a9bcda1
am: eb576150d5 Change-Id: If60dd4fa06a11aa72671573784c0d7774ae4c3ec
-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 02d4137203..b67f4d9328 100644
--- a/libs/ui/Fence.cpp
+++ b/libs/ui/Fence.cpp
@@ -165,7 +165,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;
}