summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chris Forbes <chrisforbes@google.com> 2017-05-16 19:15:38 +0000
committer android-build-merger <android-build-merger@google.com> 2017-05-16 19:15:38 +0000
commit05df3a6f4d332448aab30a83204551424c114479 (patch)
tree31c0d4c045950782e443da7f2c93d9e38a157801
parentbec844f6d4661325b3f925073876b381882d3e73 (diff)
parent5c5ee81b0cf203a22475c299819fb2418015260c (diff)
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am: 71d3ef1340
am: 5c5ee81b0c Change-Id: Ie7ec2067057ea2dbd4b9af0c93a00ba53879b72f
-rw-r--r--libs/ui/Fence.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ui/Fence.cpp b/libs/ui/Fence.cpp
index 3c0306cf0b..45e188e52a 100644
--- a/libs/ui/Fence.cpp
+++ b/libs/ui/Fence.cpp
@@ -127,7 +127,7 @@ nsecs_t Fence::getSignalTime() const {
}
size_t Fence::getFlattenedSize() const {
- return 1;
+ return 4;
}
size_t Fence::getFdCount() const {
@@ -152,7 +152,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;
}