From b730f1984f382f53bdafadad59e6070d5d0d99ba Mon Sep 17 00:00:00 2001 From: Seigo Nonaka Date: Wed, 16 Oct 2019 14:48:30 -0700 Subject: RESTRICT AUTOMERGE Revive runLimit check logic The runLimit check logic was accidentally removed by I7089ed9b711dddd7de2b27c9c2fa0fb4cb53a735 Bug: 142134328 Bug: 140632678 Test: Manually done with reported step Test: StaticLayoutTest passes Change-Id: Ib1d5efdcb9adcc18a6a43370dc016ea464f48148 --- core/java/android/text/TextLine.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/core/java/android/text/TextLine.java b/core/java/android/text/TextLine.java index d5b115a699b0..0e4f1e56f036 100644 --- a/core/java/android/text/TextLine.java +++ b/core/java/android/text/TextLine.java @@ -230,6 +230,9 @@ class TextLine { for (int i = 0; i < runs.length; i += 2) { int runStart = runs[i]; int runLimit = runStart + (runs[i+1] & Layout.RUN_LENGTH_MASK); + if (runLimit > mLen) { + runLimit = mLen; + } if (runStart > mLen) break; boolean runIsRtl = (runs[i+1] & Layout.RUN_RTL_FLAG) != 0; @@ -305,6 +308,9 @@ class TextLine { for (int i = 0; i < runs.length; i += 2) { int runStart = runs[i]; int runLimit = runStart + (runs[i+1] & Layout.RUN_LENGTH_MASK); + if (runLimit > mLen) { + runLimit = mLen; + } if (runStart > mLen) break; boolean runIsRtl = (runs[i+1] & Layout.RUN_RTL_FLAG) != 0; @@ -392,6 +398,9 @@ class TextLine { for (int i = 0; i < runs.length; i += 2) { int runStart = runs[i]; int runLimit = runStart + (runs[i + 1] & Layout.RUN_LENGTH_MASK); + if (runLimit > mLen) { + runLimit = mLen; + } if (runStart > mLen) break; boolean runIsRtl = (runs[i + 1] & Layout.RUN_RTL_FLAG) != 0; -- cgit v1.2.3-59-g8ed1b