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

am 4039f657: Merge "Improve boundary check for for Paint#DrawTextRun." into mnc-dev

Browse Source 
* commit '4039f6570cff0013d3986b522d43e6eab7cc28a6':
  Improve boundary check for for Paint#DrawTextRun.
This commit is contained in:
Keisuke Kuroyanagi
2015-06-11 22:54:18 +00:00
committed by Android Git Automerger
parent 9c5f1c334b 4039f6570c
commit f22228b392
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
graphics/java/android/graphics/Canvas.java
View File

@@ -1728,8 +1728,7 @@ public class Canvas {
* @param contextIndex the start of the context for shaping. Must be * @param contextIndex the start of the context for shaping. Must be
* no greater than index. * no greater than index.
* @param contextCount the number of characters in the context for shaping. * @param contextCount the number of characters in the context for shaping.
* contexIndex + contextCount must be no less than index * contexIndex + contextCount must be no less than index + count.
* + count.
* @param x the x position at which to draw the text * @param x the x position at which to draw the text
* @param y the y position at which to draw the text * @param y the y position at which to draw the text
* @param isRtl whether the run is in RTL direction * @param isRtl whether the run is in RTL direction
@@ -1744,12 +1743,14 @@ public class Canvas {
if (paint == null) { if (paint == null) {
throw new NullPointerException("paint is null"); throw new NullPointerException("paint is null");
} }
if ((index | count | text.length - index - count) < 0) { if ((index | count | contextIndex | contextCount | index - contextIndex
| (contextIndex + contextCount) - (index + count)
| text.length - (contextIndex + contextCount)) < 0) {
throw new IndexOutOfBoundsException(); throw new IndexOutOfBoundsException();
} }
native_drawTextRun(mNativeCanvasWrapper, text, index, count, native_drawTextRun(mNativeCanvasWrapper, text, index, count, contextIndex, contextCount,
contextIndex, contextCount, x, y, isRtl, paint.getNativeInstance(), paint.mNativeTypeface); x, y, isRtl, paint.getNativeInstance(), paint.mNativeTypeface);
} }
/** /**
@@ -1796,14 +1797,15 @@ public class Canvas {
if (paint == null) { if (paint == null) {
throw new NullPointerException("paint is null"); throw new NullPointerException("paint is null");
} }
if ((start | end | end - start | text.length() - end) < 0) { if ((start | end | contextStart | contextEnd | start - contextStart | end - start
| contextEnd - end | text.length() - contextEnd) < 0) {
throw new IndexOutOfBoundsException(); throw new IndexOutOfBoundsException();
} }
if (text instanceof String || text instanceof SpannedString || if (text instanceof String || text instanceof SpannedString ||
text instanceof SpannableString) { text instanceof SpannableString) {
native_drawTextRun(mNativeCanvasWrapper, text.toString(), start, end, native_drawTextRun(mNativeCanvasWrapper, text.toString(), start, end, contextStart,
contextStart, contextEnd, x, y, isRtl, paint.getNativeInstance(), paint.mNativeTypeface); contextEnd, x, y, isRtl, paint.getNativeInstance(), paint.mNativeTypeface);
} else if (text instanceof GraphicsOperations) { } else if (text instanceof GraphicsOperations) {
((GraphicsOperations) text).drawTextRun(this, start, end, ((GraphicsOperations) text).drawTextRun(this, start, end,
contextStart, contextEnd, x, y, isRtl, paint); contextStart, contextEnd, x, y, isRtl, paint);