diff options
| author | Abhishek Arya <aarya@google.com> | 2015-08-21 15:28:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-21 15:28:55 +0000 |
| commit | e93a33a8f2706d3918634d17c33491f69060a62c (patch) | |
| tree | eacc4c3d81ae6bb7b7e6c5c483a6f170a0dbdd30 /media | |
| parent | e534b0e898e4a97f392b4132c8c6a571f2bdcb6f (diff) | |
| parent | 8cc71bc8f32ba85fc7e2b9dac0d7450147a4f3db (diff) | |
| download | frameworks_av-e93a33a8f2706d3918634d17c33491f69060a62c.zip frameworks_av-e93a33a8f2706d3918634d17c33491f69060a62c.tar.gz frameworks_av-e93a33a8f2706d3918634d17c33491f69060a62c.tar.bz2 | |
am 8cc71bc8: Merge "DO NOT MERGE Part of fix for libmedia OOB write anywhere" into lmp-dev
* commit '8cc71bc8f32ba85fc7e2b9dac0d7450147a4f3db':
DO NOT MERGE Part of fix for libmedia OOB write anywhere
Diffstat (limited to 'media')
| -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 0d5f990..7bd120e 100644 --- a/media/libmedia/ICrypto.cpp +++ b/media/libmedia/ICrypto.cpp @@ -247,9 +247,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); } @@ -262,7 +262,7 @@ status_t BnCrypto::onTransact( mode, srcData, subSamples, numSubSamples, - dstPtr, + secure ? secureBufferId : dstPtr, &errorDetailMsg); reply->writeInt32(result); |