diff options
| author | Jeff Tinker <jtinker@google.com> | 2015-08-21 15:36:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-21 15:36:21 +0000 |
| commit | fd1d6df52f4c33f59d44abdbcdd0ec5b9a20f059 (patch) | |
| tree | 457d61467a5f2f5797b695565dfd3e46310f8534 /media/libmedia | |
| parent | f839b2a33c46f3520684f0a839760cca36a6b4c7 (diff) | |
| parent | c2153d0dc800d0718788dccd0f2a2d29f4647c03 (diff) | |
| download | frameworks_av-fd1d6df52f4c33f59d44abdbcdd0ec5b9a20f059.zip frameworks_av-fd1d6df52f4c33f59d44abdbcdd0ec5b9a20f059.tar.gz frameworks_av-fd1d6df52f4c33f59d44abdbcdd0ec5b9a20f059.tar.bz2 | |
am c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhere
* commit 'c2153d0dc800d0718788dccd0f2a2d29f4647c03':
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 98b183a..55e9695 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 = (void *)data.readIntPtr(); + secureBufferId = (void *)data.readIntPtr(); } else { dstPtr = malloc(totalSize); } @@ -262,7 +262,7 @@ status_t BnCrypto::onTransact( mode, srcData, subSamples, numSubSamples, - dstPtr, + secure ? secureBufferId : dstPtr, &errorDetailMsg); reply->writeInt32(result); |