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

Merge changes from topic "am-74e79eb6-59c1-4f9c-a993-72eeee3859c4" into oc-dev

Browse Source 
* changes:
  [automerger] Verify last array's length in readFromParcel am: 3b8bc2e450 am: 71478241eb am: e0b5c2d25e am: fa32631c63 am: 3a295c1c7f
  [automerger] Verify last array's length in readFromParcel am: 3b8bc2e450 am: 71478241eb am: e0b5c2d25e am: fa32631c63
  [automerger] Verify last array's length in readFromParcel am: 3b8bc2e450 am: 71478241eb am: e0b5c2d25e
  [automerger] Verify last array's length in readFromParcel am: 3b8bc2e450 am: 71478241eb
  [automerger] Verify last array's length in readFromParcel am: 3b8bc2e450
  Verify last array's length in readFromParcel
This commit is contained in:
Fyodor Kupolov
2018-03-08 20:30:06 +00:00
committed by Android (Google) Code Review
parent 5d2153d17c 286944d5c9
commit b6b6c01847
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/app/procstats/SparseMappingTable.java
View File

@@ -18,6 +18,7 @@ package com.android.internal.app.procstats;
import android.os.Build;
import android.os.Parcel;
import android.util.EventLog;
import android.util.Slog;
import libcore.util.EmptyArray;
@@ -529,6 +530,12 @@ public class SparseMappingTable {
readCompactedLongArray(in, array, size);
mLongs.add(array);
}
// Verify that last array's length is consistent with writeToParcel
if (N > 0 && mLongs.get(N - 1).length != mNextIndex) {
EventLog.writeEvent(0x534e4554, "73252178", -1, "");
throw new IllegalStateException("Expected array of length " + mNextIndex + " but was "
+ mLongs.get(N - 1).length);
}
}
/**