commit 1e3a02a61c1d381c365c5295fc2ced702df4d170
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed Aug 15 03:06:11 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed Aug 15 03:06:11 2018 +0000
tree 6bd71d1dd8fbd30f6b5ddf471393ba66c76b676b
parent 4572777872c494ca442ff433d448cbecb94bb11d
parent 949bb9853554f36e9887d26c75d322d426453bdb

[automerger] Fix information disclosure in mediadrmserver DO NOT MERGE am: ecb2df5bc0 am: c88022c3de am: eea2ec03a4 am: 949bb98535

Change-Id: I52549e142d262a3c32996d2a70b86963e1e79a37

media/libmedia/ICrypto.cpp

diff --git a/media/libmedia/ICrypto.cpp b/media/libmedia/ICrypto.cpp
index 302e6ee..aa222c5 100644
--- a/media/libmedia/ICrypto.cpp
+++ b/media/libmedia/ICrypto.cpp
@@ -199,8 +199,13 @@
 
 void BnCrypto::readVector(const Parcel &data, Vector<uint8_t> &vector) const {
     uint32_t size = data.readInt32();
-    vector.insertAt((size_t)0, size);
-    data.read(vector.editArray(), size);
+    if (vector.insertAt((size_t)0, size) < 0) {
+        vector.clear();
+    }
+    if (data.read(vector.editArray(), size) != NO_ERROR) {
+        vector.clear();
+        android_errorWriteWithInfoLog(0x534e4554, "62872384", -1, NULL, 0);
+    }
 }
 
 void BnCrypto::writeVector(Parcel *reply, Vector<uint8_t> const &vector) const {