diff options
| author | Mathias Agopian <mathias@google.com> | 2010-11-08 13:40:40 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-08 13:40:40 -0800 |
| commit | fe40e9e0ce7b5536be9f9ff0596714a0eb921b1e (patch) | |
| tree | 9a9258521c869886756cc9bc24b373f642b79a0c /libs | |
| parent | a48b70fa8ff6363d1e5282be70f6be12bc0688dc (diff) | |
| parent | 7bf1521b6b90bac8d323d4751f2d300f4cacc046 (diff) | |
| download | frameworks_base-fe40e9e0ce7b5536be9f9ff0596714a0eb921b1e.zip frameworks_base-fe40e9e0ce7b5536be9f9ff0596714a0eb921b1e.tar.gz frameworks_base-fe40e9e0ce7b5536be9f9ff0596714a0eb921b1e.tar.bz2 | |
Merge "fix [3148312] Region can access data out of bounds" into gingerbread
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ui/Region.cpp | 2 |
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; |