diff options
| author | 2017-05-16 19:12:38 +0000 | |
|---|---|---|
| committer | 2017-05-16 19:12:38 +0000 | |
| commit | 5c5ee81b0cf203a22475c299819fb2418015260c (patch) | |
| tree | d78868e01f30623b5c83bf21e169a21a7658ea4f /libs/ui/Fence.cpp | |
| parent | 057ae95ab242b18944b783a5479950bb3492b79d (diff) | |
| parent | 71d3ef134034f6ae440769056bf45bfb18dfb39a (diff) | |
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0
am: 71d3ef1340
Change-Id: I75797414173ebfb38eefe02ac0a635f10c59d883
Diffstat (limited to 'libs/ui/Fence.cpp')
| -rw-r--r-- | libs/ui/Fence.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ui/Fence.cpp b/libs/ui/Fence.cpp index 93ec0ce611..2a771502d7 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; } |