diff options
| author | Jeff Tinker <jtinker@google.com> | 2018-08-14 21:20:16 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-08-14 21:20:16 -0700 |
| commit | f19106c7cc11e62411677d8f4a4059e315bf8279 (patch) | |
| tree | a0065d9a61b580c97e698651cc94ad9dd384911c /drm | |
| parent | fc842287cc2c1397c03a48f6d60a54e4dcf109f4 (diff) | |
| parent | dd57ac5b265b50dc90fb01750f64f901a2f5b048 (diff) | |
| download | frameworks_av-f19106c7cc11e62411677d8f4a4059e315bf8279.tar.gz frameworks_av-f19106c7cc11e62411677d8f4a4059e315bf8279.tar.bz2 frameworks_av-f19106c7cc11e62411677d8f4a4059e315bf8279.zip | |
Merge "Fix information disclosure in mediadrmserver" into oc-dev am: f452267ae8
am: dd57ac5b26
Change-Id: I6bf2cbd05b71fc09320de267c89210319be427a6
Diffstat (limited to 'drm')
| -rw-r--r-- | drm/libmediadrm/ICrypto.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drm/libmediadrm/ICrypto.cpp b/drm/libmediadrm/ICrypto.cpp index 1d70a4e0f0..ee5ea936c4 100644 --- a/drm/libmediadrm/ICrypto.cpp +++ b/drm/libmediadrm/ICrypto.cpp @@ -225,8 +225,13 @@ IMPLEMENT_META_INTERFACE(Crypto, "android.hardware.ICrypto"); 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 { |