diff options
| author | Jeff Tinker <jtinker@google.com> | 2015-09-17 17:04:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-17 17:04:25 +0000 |
| commit | 6272fa1baf361a6a89607243638cc592047947b3 (patch) | |
| tree | e3f95e231ec43d93a06ff6bdd09f322bf5b305d4 /media | |
| parent | f43125ed08a408b02613b99f058564d97ce690cc (diff) | |
| parent | 636539eb1a0d407d7f82b7c9a6d9833f7715e287 (diff) | |
| download | frameworks_av-6272fa1baf361a6a89607243638cc592047947b3.zip frameworks_av-6272fa1baf361a6a89607243638cc592047947b3.tar.gz frameworks_av-6272fa1baf361a6a89607243638cc592047947b3.tar.bz2 | |
Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-dev
Diffstat (limited to 'media')
| -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 2053c45..918d725 100644 --- a/media/libmedia/ICrypto.cpp +++ b/media/libmedia/ICrypto.cpp @@ -236,6 +236,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(); @@ -252,6 +253,7 @@ status_t BnCrypto::onTransact( secureBufferId = (void *)data.readIntPtr(); } else { dstPtr = malloc(totalSize); + memset(dstPtr, 0, totalSize); } AString errorDetailMsg; |