summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2011-09-26 15:58:20 -0700
committerMathias Agopian <mathias@google.com>2011-09-26 15:58:20 -0700
commit0ee06d116bc37c8b9a2d90a40651b3f6a0a709f9 (patch)
tree86946128857e0d9fca1a37821bd4298c1c012932
parent71bfec448847d8585c8a789596525dc729350877 (diff)
downloadframeworks_base-0ee06d116bc37c8b9a2d90a40651b3f6a0a709f9.zip
frameworks_base-0ee06d116bc37c8b9a2d90a40651b3f6a0a709f9.tar.gz
frameworks_base-0ee06d116bc37c8b9a2d90a40651b3f6a0a709f9.tar.bz2
Region cannot handle malformed Rects. Abort the Region op in that case.
Bug: 5331198, 5334829 Change-Id: Ib1fdbf6fb291e7f1191ccfe16b5ff29d73e7a474
-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 8dab291..5656088 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