[RTT] ParcelableRttResults parcel code fix

etancohen · android-build-team Robot · commit 5a3d2708cd22 · 2018-02-08T04:11:48.000Z
ParcelableRttResults was unparceled incorrectly. Bug: 70398564 Test: exploit provided in bug no longer works Change-Id: Ifd6de547e9861bbebc399b43d0cc2899a8160813 (cherry picked from commit e1e5a24)
diff --git a/wifi/java/android/net/wifi/RttManager.java b/wifi/java/android/net/wifi/RttManager.java
@@ -847,8 +847,8 @@ public void writeToParcel(Parcel dest, int flags) {
                     }
                     dest.writeByte(result.LCR.id);
                     if (result.LCR.id != (byte) 0xFF) {
-                        dest.writeInt((byte) result.LCR.data.length);
-                        dest.writeByte(result.LCR.id);
+                        dest.writeByte((byte) result.LCR.data.length);
+                        dest.writeByteArray(result.LCR.data);
                     }
                     dest.writeByte(result.secure ? (byte) 1 : 0);
                 }

Original file line number	Diff line number	Diff line change
`@@ -847,8 +847,8 @@ public void writeToParcel(Parcel dest, int flags) {`
`847`	`847`	`}`
`848`	`848`	`dest.writeByte(result.LCR.id);`
`849`	`849`	`if (result.LCR.id != (byte) 0xFF) {`
`850`		`- dest.writeInt((byte) result.LCR.data.length);`
`851`		`- dest.writeByte(result.LCR.id);`
	`850`	`+ dest.writeByte((byte) result.LCR.data.length);`
	`851`	`+ dest.writeByteArray(result.LCR.data);`
`852`	`852`	`}`
`853`	`853`	`dest.writeByte(result.secure ? (byte) 1 : 0);`
`854`	`854`	`}`