diff options
| author | Abhishek Arya <aarya@google.com> | 2015-08-21 15:46:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-21 15:46:30 +0000 |
| commit | b512e0a3697ccaaf4687867fe0aee8d3dbb7003c (patch) | |
| tree | cd2a2983b84ae7384b2fb9192428a78bc9f69188 /media/libmedia | |
| parent | 1c12b44cab37c6287e5314668b8f5192f0501d68 (diff) | |
| parent | 0ea1da27437575f6b075860fa858a257c806d5ef (diff) | |
| download | frameworks_av-b512e0a3697ccaaf4687867fe0aee8d3dbb7003c.zip frameworks_av-b512e0a3697ccaaf4687867fe0aee8d3dbb7003c.tar.gz frameworks_av-b512e0a3697ccaaf4687867fe0aee8d3dbb7003c.tar.bz2 | |
am 0ea1da27: am 5f126c0d: am e93a33a8: am 8cc71bc8: Merge "DO NOT MERGE Part of fix for libmedia OOB write anywhere" into lmp-dev
* commit '0ea1da27437575f6b075860fa858a257c806d5ef':
DO NOT MERGE Part of fix for libmedia OOB write anywhere
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/ICrypto.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libmedia/ICrypto.cpp b/media/libmedia/ICrypto.cpp index c26c5bf..f7d8bc6 100644 --- a/media/libmedia/ICrypto.cpp +++ b/media/libmedia/ICrypto.cpp @@ -257,9 +257,9 @@ status_t BnCrypto::onTransact( subSamples, sizeof(CryptoPlugin::SubSample) * numSubSamples); - void *dstPtr; + void *secureBufferId, *dstPtr; if (secure) { - dstPtr = reinterpret_cast<void *>(static_cast<uintptr_t>(data.readInt64())); + secureBufferId = reinterpret_cast<void *>(static_cast<uintptr_t>(data.readInt64())); } else { dstPtr = malloc(totalSize); } @@ -272,7 +272,7 @@ status_t BnCrypto::onTransact( mode, srcData, subSamples, numSubSamples, - dstPtr, + secure ? secureBufferId : dstPtr, &errorDetailMsg); reply->writeInt32(result); |