summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chris Forbes <chrisforbes@google.com> 2017-05-16 19:18:41 +0000
committer android-build-merger <android-build-merger@google.com> 2017-05-16 19:18:41 +0000
commit81bab8081e1ddaad809abc91f3d11c2021e6c711 (patch)
tree79d0ac86d8685149919384047b79abaa1239d3bf
parente7c7be2c179b7da739732827d22d35c566d9c2e4 (diff)
parent05df3a6f4d332448aab30a83204551424c114479 (diff)
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am: 71d3ef1340 am: 5c5ee81b0c
am: 05df3a6f4d Change-Id: I50c771aee7375315ba6c6aa4029baacfe9c199d8
-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;
}