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 | a2b1b7f71da2ad22b7c88e3c1839b1ce05aa65e6 (patch) | |
| tree | aa43e1349cb1a180fb7acc399d7b73ca3900d803 /libs | |
| parent | dca7b6fbd01afa0fe26925307d2c721439b3b63f (diff) | |
| parent | 0cc0399b6bc9044942db282514fba42b5d2a1d09 (diff) | |
| download | frameworks_native-a2b1b7f71da2ad22b7c88e3c1839b1ce05aa65e6.zip frameworks_native-a2b1b7f71da2ad22b7c88e3c1839b1ce05aa65e6.tar.gz frameworks_native-a2b1b7f71da2ad22b7c88e3c1839b1ce05aa65e6.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; |