ui: Fix bad size check in Fence::unflatten

chrisforbes · andi34 · commit 3a7ede0ea535 · 2017-07-17T22:15:12.000+02:00
Differs slightly from mnc+ patch: GetFlattenedSize was fixed in mnc. Test: Boot device, run poc from bug, observe no longer crashes Bug: 3728568 AOSP-Change-Id: Id8b851733b088cce0d07493fbf76e7e24f9299ad (cherry picked from commit 9809602) Change-Id: I82dd3b0504763c9213ca56b33790b7faa17bb9ad
diff --git a/libs/ui/Fence.cpp b/libs/ui/Fence.cpp
@@ -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;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ status_t Fence::unflatten(void const& buffer, size_t& size, int const& fds, si`
`152`	`152`	`return INVALID_OPERATION;`
`153`	`153`	`}`
`154`	`154`
`155`		`- if (size < 1) {`
	`155`	`+ if (size < getFlattenedSize()) {`
`156`	`156`	`return NO_MEMORY;`
`157`	`157`	`}`
`158`	`158`