Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am: 71d3ef1340 (05df3a6f) · Commits · e / os / android_frameworks_native

libs/ui/Fence.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -127,7 +127,7 @@ nsecs_t Fence::getSignalTime() const {
	}		}

	size_t Fence::getFlattenedSize() const {		size_t Fence::getFlattenedSize() const {
	return 1;		return 4;
	}		}

	size_t Fence::getFdCount() const {		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;		return INVALID_OPERATION;
	}		}

	if (size < 1) {		if (size < getFlattenedSize()) {
	return NO_MEMORY;		return NO_MEMORY;
	}		}