Merge "Sanity check network stats coming from disk." into jb-mr1-dev

jsharkey · Android (Google) Code Review · commit 1c743650addb · 2012-11-02T15:49:20.000-07:00
diff --git a/core/java/android/net/NetworkStatsHistory.java b/core/java/android/net/NetworkStatsHistory.java
@@ -177,6 +177,12 @@ public NetworkStatsHistory(DataInputStream in) throws IOException {
                 throw new ProtocolException("unexpected version: " + version);
             }
         }
+
+        if (bucketStart.length != bucketCount || rxBytes.length != bucketCount
+                || rxPackets.length != bucketCount || txBytes.length != bucketCount
+                || txPackets.length != bucketCount || operations.length != bucketCount) {
+            throw new ProtocolException("Mismatched history lengths");
+        }
     }
 
     public void writeToStream(DataOutputStream out) throws IOException {

Original file line number	Diff line number	Diff line change
`@@ -177,6 +177,12 @@ public NetworkStatsHistory(DataInputStream in) throws IOException {`
`177`	`177`	`throw new ProtocolException("unexpected version: " + version);`
`178`	`178`	`}`
`179`	`179`	`}`
	`180`	`+`
	`181`	`+ if (bucketStart.length != bucketCount \|\| rxBytes.length != bucketCount`
	`182`	`+ \|\| rxPackets.length != bucketCount \|\| txBytes.length != bucketCount`
	`183`	`+ \|\| txPackets.length != bucketCount \|\| operations.length != bucketCount) {`
	`184`	`+ throw new ProtocolException("Mismatched history lengths");`
	`185`	`+ }`
`180`	`186`	`}`
`181`	`187`
`182`	`188`	`public void writeToStream(DataOutputStream out) throws IOException {`