diff options
| author | Jeff Tinker <jtinker@google.com> | 2015-09-21 18:58:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-21 18:58:02 +0000 |
| commit | 9dcb4c63c6b8876a28eab3774ac92cc5e3af13c7 (patch) | |
| tree | 3bda253cf775abffaaf5415c71ff2aeb4fa383d2 | |
| parent | 1ac11129220c71a208da4b4339ac6131132a7bd8 (diff) | |
| parent | 4ae700d2bd467f18e5de8b5d1579d7e20da88e36 (diff) | |
| download | frameworks_av-9dcb4c63c6b8876a28eab3774ac92cc5e3af13c7.zip frameworks_av-9dcb4c63c6b8876a28eab3774ac92cc5e3af13c7.tar.gz frameworks_av-9dcb4c63c6b8876a28eab3774ac92cc5e3af13c7.tar.bz2 | |
am 4ae700d2: am 160ed868: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into lmp-dev
* commit '4ae700d2bd467f18e5de8b5d1579d7e20da88e36':
DO NOT MERGE Fix vulnerability in mediaserver
| -rw-r--r-- | media/libmedia/ICrypto.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libmedia/ICrypto.cpp b/media/libmedia/ICrypto.cpp index 2abb3ac..f51aaa2 100644 --- a/media/libmedia/ICrypto.cpp +++ b/media/libmedia/ICrypto.cpp @@ -246,6 +246,7 @@ status_t BnCrypto::onTransact( size_t totalSize = data.readInt32(); void *srcData = malloc(totalSize); + memset(srcData, 0, totalSize); data.read(srcData, totalSize); int32_t numSubSamples = data.readInt32(); @@ -262,6 +263,7 @@ status_t BnCrypto::onTransact( secureBufferId = reinterpret_cast<void *>(static_cast<uintptr_t>(data.readInt64())); } else { dstPtr = malloc(totalSize); + memset(dstPtr, 0, totalSize); } AString errorDetailMsg; |