Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix int overflow in SpannableStringBuilder.replace" into nyc-dev

Browse Source
This commit is contained in:
Siyamed Sinir
2016-06-08 00:46:27 +00:00
committed by Android (Google) Code Review
parent c82a2b5358 eb4df8a822
commit 96c3e5504b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/text/SpannableStringBuilder.java
View File

@@ -19,7 +19,6 @@ package android.text;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Paint; import android.graphics.Paint;
import android.text.style.ParagraphStyle;
import android.util.Log; import android.util.Log;
import com.android.internal.util.ArrayUtils; import com.android.internal.util.ArrayUtils;
@@ -554,7 +553,8 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable
if (adjustSelection) { if (adjustSelection) {
boolean changed = false; boolean changed = false;
if (selectionStart > start && selectionStart < end) { if (selectionStart > start && selectionStart < end) {
final int offset = (selectionStart - start) * newLen / origLen; final long diff = selectionStart - start;
final int offset = Math.toIntExact(diff * newLen / origLen);
selectionStart = start + offset; selectionStart = start + offset;
changed = true; changed = true;
@@ -562,7 +562,8 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable
Spanned.SPAN_POINT_POINT); Spanned.SPAN_POINT_POINT);
} }
if (selectionEnd > start && selectionEnd < end) { if (selectionEnd > start && selectionEnd < end) {
final int offset = (selectionEnd - start) * newLen / origLen; final long diff = selectionEnd - start;
final int offset = Math.toIntExact(diff * newLen / origLen);
selectionEnd = start + offset; selectionEnd = start + offset;
changed = true; changed = true;