diff options
| author | Jeff Tinker <jtinker@google.com> | 2015-09-17 17:04:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-17 17:04:41 +0000 |
| commit | dffe5cdb436987a65a9010460979507c06b5c904 (patch) | |
| tree | f0ca0c06e78d32c5c7b6c8b58c986a0878ea0044 /media/libmedia | |
| parent | 190eca5a52f412ceac7622107db6d393b235c3b5 (diff) | |
| parent | 3fd87605288d6d8e5abebadbddfa6071387fecdd (diff) | |
| download | frameworks_av-dffe5cdb436987a65a9010460979507c06b5c904.zip frameworks_av-dffe5cdb436987a65a9010460979507c06b5c904.tar.gz frameworks_av-dffe5cdb436987a65a9010460979507c06b5c904.tar.bz2 | |
Merge "DO NOT MERGE Fix vulnerability in mediaserver" into mnc-dev
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/ICrypto.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/ICrypto.cpp b/media/libmedia/ICrypto.cpp index 9703b0d..a398ff7 100644 --- a/media/libmedia/ICrypto.cpp +++ b/media/libmedia/ICrypto.cpp @@ -297,7 +297,7 @@ status_t BnCrypto::onTransact( if (secure) { secureBufferId = reinterpret_cast<void *>(static_cast<uintptr_t>(data.readInt64())); } else { - dstPtr = malloc(totalSize); + dstPtr = calloc(1, totalSize); } AString errorDetailMsg; |