diff options
| author | Abhishek Arya <aarya@google.com> | 2015-08-21 15:22:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-21 15:22:37 +0000 |
| commit | 8cc71bc8f32ba85fc7e2b9dac0d7450147a4f3db (patch) | |
| tree | 849d18a0d5ad54470904bfbfe7e24004ede61cb3 /media | |
| parent | 008807813e8fd703f89bf84c8f2c725bb19a434f (diff) | |
| parent | aa4da6fa7ca2454f0713de0a5a583b5b8160166b (diff) | |
| download | frameworks_av-8cc71bc8f32ba85fc7e2b9dac0d7450147a4f3db.zip frameworks_av-8cc71bc8f32ba85fc7e2b9dac0d7450147a4f3db.tar.gz frameworks_av-8cc71bc8f32ba85fc7e2b9dac0d7450147a4f3db.tar.bz2 | |
Merge "DO NOT MERGE Part of fix for libmedia OOB write anywhere" into lmp-dev
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); |