Merge "Region cannot handle malformed Rects. Abort the Region op in that case."

pixelflinger · Android (Google) Code Review · commit 6098a2162a9d · 2011-09-26T16:10:08.000-07:00
diff --git a/libs/ui/Region.cpp b/libs/ui/Region.cpp
@@ -482,6 +482,7 @@ void Region::boolean_operation(int op, Region& dst,
     if (!rhs.isValid()) {
         LOGE("Region::boolean_operation(op=%d) invalid Rect={%d,%d,%d,%d}",
                 op, rhs.left, rhs.top, rhs.right, rhs.bottom);
+        return;
     }
 
 #if VALIDATE_WITH_CORECG || VALIDATE_REGIONS

Original file line number	Diff line number	Diff line change
`@@ -482,6 +482,7 @@ void Region::boolean_operation(int op, Region& dst,`
`482`	`482`	`if (!rhs.isValid()) {`
`483`	`483`	`LOGE("Region::boolean_operation(op=%d) invalid Rect={%d,%d,%d,%d}",`
`484`	`484`	`op, rhs.left, rhs.top, rhs.right, rhs.bottom);`
	`485`	`+ return;`
`485`	`486`	`}`
`486`	`487`
`487`	`488`	`#if VALIDATE_WITH_CORECG \|\| VALIDATE_REGIONS`