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

Maybe fix issue #2145012: Array bounds exception in touch event processing

Browse Source 
Change-Id: I223d9ae29f22f08cb8426ccd8bbadeedd5db3fc3
This commit is contained in:
Dianne Hackborn
2009-09-26 17:34:50 -07:00
parent 093f581090
commit 2397640740
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/MotionEvent.java
View File

@@ -1104,13 +1104,13 @@ public final class MotionEvent implements Parcelable {
final int NS = mNumSamples; final int NS = mNumSamples;
final int NI = NP*NS; final int NI = NP*NS;
final int ND = NI * NUM_SAMPLE_DATA; final int ND = NI * NUM_SAMPLE_DATA;
if (data.length <= ND) { if (data.length < (ND+(NP*NUM_SAMPLE_DATA))) {
final int NEW_ND = ND + (NP * (BASE_AVAIL_SAMPLES * NUM_SAMPLE_DATA)); final int NEW_ND = ND + (NP * (BASE_AVAIL_SAMPLES * NUM_SAMPLE_DATA));
float[] newData = new float[NEW_ND]; float[] newData = new float[NEW_ND];
System.arraycopy(data, 0, newData, 0, ND); System.arraycopy(data, 0, newData, 0, ND);
mDataSamples = data = newData; mDataSamples = data = newData;
} }
if (times.length <= NS) { if (times.length < (NS+1)) {
final int NEW_NS = NS + BASE_AVAIL_SAMPLES; final int NEW_NS = NS + BASE_AVAIL_SAMPLES;
long[] newHistoryTimes = new long[NEW_NS]; long[] newHistoryTimes = new long[NEW_NS];
System.arraycopy(times, 0, newHistoryTimes, 0, NS); System.arraycopy(times, 0, newHistoryTimes, 0, NS);