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

Commit 505ffe36 authored by Raph Levien's avatar Raph Levien Committed by Android (Google) Code Review
Browse files

Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev

parents 25f7c4b9 d82f8a9a

core/java/android/view/GLES20Canvas.java

+3 −0
Original line number Diff line number Diff line
@@ -885,6 +885,9 @@ class GLES20Canvas extends HardwareCanvas { 


    @Override

    public void drawText(CharSequence text, int start, int end, float x, float y, Paint paint) {

        if ((start | end | (end - start) | (text.length() - end)) < 0) {

            throw new IndexOutOfBoundsException();

        }

        if (text instanceof String || text instanceof SpannedString ||

                text instanceof SpannableString) {

            nDrawText(mRenderer, text.toString(), start, end, x, y, paint.mBidiFlags,

graphics/java/android/graphics/Canvas.java

+3 −0
Original line number Diff line number Diff line
@@ -1710,6 +1710,9 @@ public class Canvas { 
     */

    public void drawText(@NonNull CharSequence text, int start, int end, float x, float y,

            @NonNull Paint paint) {

        if ((start | end | (end - start) | (text.length() - end)) < 0) {

            throw new IndexOutOfBoundsException();

        }

        if (text instanceof String || text instanceof SpannedString ||

            text instanceof SpannableString) {

            native_drawText(mNativeCanvasWrapper, text.toString(), start, end, x, y,