Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32929413 authored by Eric Fischer's avatar Eric Fischer
Browse files

Avoid a crash trying to get a substring whose start is after its end. 

Constrain the start of the extracted text, not just the end, to the length
of the content.

Approver: ryanpc
Bug: 2323813
parent da4cc343

core/java/android/widget/TextView.java

+5 −0
Original line number Diff line number Diff line
@@ -4531,6 +4531,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
                    // Now use the delta to determine the actual amount of text

                    // we need.

                    partialEndOffset += delta;

                    if (partialStartOffset > N) {

                        partialStartOffset = N;

                    } else if (partialStartOffset < 0) {

                        partialStartOffset = 0;

                    }

                    if (partialEndOffset > N) {

                        partialEndOffset = N;

                    } else if (partialEndOffset < 0) {