commit e41b49b5ea0c881b5db04d74071bfddbc9bc388d
author Jeff Tinker <jtinker@google.com> Wed Oct 18 18:23:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 18 18:23:23 2017 +0000
tree 657fdfb638ee18ee86ac530dc908ba524a2d44da
parent 7648415fc8a6afd9f02bef96081f0ba1f2af0cb6
parent 70dc77cc94c285236e9fff50dbaefaf20b5528eb

Fix information disclosure in mediadrmserver am: b41a527176
am: 70dc77cc94

Change-Id: I1f9148571954ffc8e3727e90f6d84f039a8ddd5c

media/libmedia/IDrm.cpp

diff --git a/media/libmedia/IDrm.cpp b/media/libmedia/IDrm.cpp
index 6f6530b..637770d 100644
--- a/media/libmedia/IDrm.cpp
+++ b/media/libmedia/IDrm.cpp
@@ -572,8 +572,13 @@
 
 void BnDrm::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 BnDrm::writeVector(Parcel *reply, Vector<uint8_t> const &vector) const {