summaryrefslogtreecommitdiff
path: root/libs/ui/Fence.cpp
diff options
context:
space:
mode:
author Chris Forbes <chrisforbes@google.com> 2017-05-16 19:39:41 +0000
committer android-build-merger <android-build-merger@google.com> 2017-05-16 19:39:41 +0000
commita078c0780c256e60bb31258c156ef2c507fb2da7 (patch)
tree6897deae1b5d9fd234c8bb369ae9e6b8d3ec44fd /libs/ui/Fence.cpp
parent146f77fc3cb349ce78788acbc2cc518a7b7ce676 (diff)
parentce069c5a07c7f370b715b94af64a2a3c6c1f4e6f (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 Change-Id: Ic185b2a7c35ea0260d5380d606f6b7b82c78b717
Diffstat (limited to 'libs/ui/Fence.cpp')
-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;
}