diff options
| author | Abhishek Arya <aarya@google.com> | 2015-08-21 15:34:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-21 15:34:50 +0000 |
| commit | 5f126c0d09b55817d1f94b3845a3c220981a622d (patch) | |
| tree | 78aea84412b7abd2190379a762a486d7f9bbf5b4 /media/libmedia | |
| parent | 386c576aae9a75b31abd3122cc62520087d3a339 (diff) | |
| parent | e93a33a8f2706d3918634d17c33491f69060a62c (diff) | |
| download | frameworks_av-5f126c0d09b55817d1f94b3845a3c220981a622d.zip frameworks_av-5f126c0d09b55817d1f94b3845a3c220981a622d.tar.gz frameworks_av-5f126c0d09b55817d1f94b3845a3c220981a622d.tar.bz2 | |
am e93a33a8: am 8cc71bc8: Merge "DO NOT MERGE Part of fix for libmedia OOB write anywhere" into lmp-dev
* commit 'e93a33a8f2706d3918634d17c33491f69060a62c':
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); |