summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mathias Agopian <mathias@google.com> 2011-09-26 15:58:20 -0700
committer Mathias Agopian <mathias@google.com> 2011-09-26 16:08:52 -0700
commit781fea802b6b1c2e33a35dfe24c6ec29ed73a9c2 (patch)
tree3bca3212643c98ee9fe7092f6baf566d1dbf6878
parent04ba6d0ebd6a750d2ab2794af5bc4a8406178f00 (diff)
Region cannot handle malformed Rects. Abort the Region op in that case.
Bug: 5331198, 5334829 Change-Id: I05f2aaa95c55fe9e4a5d23180bb3032896c88151
-rw-r--r--libs/ui/Region.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/ui/Region.cpp b/libs/ui/Region.cpp
index 8dab291b3c24..565608889d28 100644
--- 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