diff options
| author | Seigo Nonaka <nona@google.com> | 2018-07-19 16:22:02 -0700 |
|---|---|---|
| committer | Ryan Longair <rlongair@google.com> | 2018-08-30 13:34:10 -0700 |
| commit | ee1a0f0cedf96f804e856b8100b75f49a12d9fc9 (patch) | |
| tree | 2b24cf674a9c0a98dda8db78b9be64b0721ccd99 | |
| parent | 2ae9ec96dcf5fe5434486e56d32073022495f987 (diff) | |
| download | base-ee1a0f0cedf96f804e856b8100b75f49a12d9fc9.tar.gz | |
Fix crash during cursor moving on BiDi text
The crash was introduced by Ib66ef392c19c937718e7101f6d48fac3abe51ad0
The root cause of the crashing is requesting out-of-line access for the
horizontal width. This invalid access is silently ignored by
TextLine#measure() method but new implementation end up with out of
bounds access.
To makes behavior as old implementation, calling getHorizontal instead
of accessing measured result array.
Bug: 78464361, 111580019
Test: Manually done
Change-Id: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8
(cherry picked from commit 960647d582911ae7ab8b9491097898e6c313aaf1)
Merged-In: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8
(cherry picked from commit 82c84d5fbb692f5ed56175c55031e30566c18ee2)
| -rw-r--r-- | core/java/android/text/Layout.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java index c94e489f89cf..3bc9390c5815 100644 --- a/core/java/android/text/Layout.java +++ b/core/java/android/text/Layout.java @@ -1390,7 +1390,8 @@ public abstract class Layout { } float get(final int offset) { - if (mHorizontals == null) { + if (mHorizontals == null || offset < mLineStartOffset + || offset >= mLineStartOffset + mHorizontals.length) { return getHorizontal(offset, mPrimary); } else { return mHorizontals[offset - mLineStartOffset]; |