Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure Region handles invalid rectangles

Browse Source 
the boolean operation code assumes rects are valid and
could go into an infinite loop if not. make sure we
abort before that happens.

Bug: 5331198, 5334829
Change-Id: I8aa42b2e0b37238ec2434b794dd84c1a1b70f163
This commit is contained in:
Mathias Agopian
2011-09-19 16:12:08 -07:00
parent 892ac4155a
commit 04ba6d0ebd
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/ui/Region.cpp
View File

@@ -479,6 +479,11 @@ void Region::boolean_operation(int op, Region& dst,
const Region& lhs, const Region& lhs,
const Rect& rhs, int dx, int dy) const Rect& rhs, int dx, int dy)
{ {
if (!rhs.isValid()) {
LOGE("Region::boolean_operation(op=%d) invalid Rect={%d,%d,%d,%d}",
op, rhs.left, rhs.top, rhs.right, rhs.bottom);
}
#if VALIDATE_WITH_CORECG || VALIDATE_REGIONS #if VALIDATE_WITH_CORECG || VALIDATE_REGIONS
boolean_operation(op, dst, lhs, Region(rhs), dx, dy); boolean_operation(op, dst, lhs, Region(rhs), dx, dy);
#else #else