commit 9ae9cba0209a8baf0a5d7463dc1c9a4831c916f6
author Adam Lesinski <adamlesinski@google.com> Wed Jul 08 17:09:34 2015 -0700
committer Adam Lesinski <adamlesinski@google.com> Wed Jul 08 17:35:42 2015 -0700
tree 36735d8f69b9bd59199ee8b378f930a620bb454d
parent 9d918db350aa52a1c01c605ef94e1158f265fed0

BatteryStats: Fail gracefully on corrupt battery stats

Bug:22328963
Change-Id: Id0b4c6334706e58483d5fdfd2c1137bfb821c409

core/java/android/os/BatteryStats.java

diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java
index fe323f3..adc84bc 100644
--- a/core/java/android/os/BatteryStats.java
+++ b/core/java/android/os/BatteryStats.java
@@ -877,6 +877,9 @@
 
         public void readFromParcel(Parcel in) {
             final int N = in.readInt();
+            if (N > mStepDurations.length) {
+                throw new ParcelFormatException("more step durations than available: " + N);
+            }
             mNumStepDurations = N;
             for (int i=0; i<N; i++) {
                 mStepDurations[i] = in.readLong();