summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chris Forbes <chrisforbes@google.com> 2017-05-16 19:30:42 +0000
committer android-build-merger <android-build-merger@google.com> 2017-05-16 19:30:42 +0000
commite3bc28ad88e56fce70fb974b1085b6127fbd3021 (patch)
tree8058f26ce3bf4b26ab0174f986895fc432497719
parent1102b311c829f143c1e7a913552bdd93ff8104a0 (diff)
parent593a1a217a536d8267e1d490e375bbaa80c4f0aa (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 Change-Id: I6c50751f24fdc5756bd5d1357df184d2a08f3c08
-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;
}