summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-10-29 15:14:08 -0700
committerMathias Agopian <mathias@google.com>2010-10-29 15:14:08 -0700
commit7bf1521b6b90bac8d323d4751f2d300f4cacc046 (patch)
treef6de126c7a6a08a6213d3c1e956ef700d48a3cd2 /libs
parent1112632a41462c5dd34c7af9f67b88188a520517 (diff)
downloadframeworks_base-7bf1521b6b90bac8d323d4751f2d300f4cacc046.zip
frameworks_base-7bf1521b6b90bac8d323d4751f2d300f4cacc046.tar.gz
frameworks_base-7bf1521b6b90bac8d323d4751f2d300f4cacc046.tar.bz2
fix [3148312] Region can access data out of bounds
Change-Id: Ic46f31d40943f405e37da21a50b55edd5a2c4124
Diffstat (limited to 'libs')
-rw-r--r--libs/ui/Region.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ui/Region.cpp b/libs/ui/Region.cpp
index 12db908..1994f6a 100644
--- a/libs/ui/Region.cpp
+++ b/libs/ui/Region.cpp
@@ -289,7 +289,7 @@ private:
void flushSpan() {
bool merge = false;
if (tail-head == ssize_t(span.size())) {
- Rect const* p = cur;
+ Rect const* p = span.editArray();
Rect const* q = head;
if (p->top == q->bottom) {
merge = true;