diff options
| author | Mathias Agopian <mathias@google.com> | 2010-11-08 13:44:00 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-08 13:44:00 -0800 |
| commit | 2ab777483c650b12f447a414c8bf9c175e8384e7 (patch) | |
| tree | 40cbbab83a869b7b58833abd4fbbed2e627f0585 /libs | |
| parent | 2ee0af48a3ebb4ac1bbf5e867850519b424e5a06 (diff) | |
| parent | fe40e9e0ce7b5536be9f9ff0596714a0eb921b1e (diff) | |
| download | frameworks_base-2ab777483c650b12f447a414c8bf9c175e8384e7.zip frameworks_base-2ab777483c650b12f447a414c8bf9c175e8384e7.tar.gz frameworks_base-2ab777483c650b12f447a414c8bf9c175e8384e7.tar.bz2 | |
am fe40e9e0: Merge "fix [3148312] Region can access data out of bounds" into gingerbread
* commit 'fe40e9e0ce7b5536be9f9ff0596714a0eb921b1e':
fix [3148312] Region can access data out of bounds
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; |