Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b512e0a3 authored by Abhishek Arya's avatar Abhishek Arya Committed by Android Git Automerger
Browse files

am 0ea1da27: am 5f126c0d: am e93a33a8: am 8cc71bc8: Merge "DO NOT MERGE Part... 

am 0ea1da27: am 5f126c0d: am e93a33a8: am 8cc71bc8: Merge "DO NOT MERGE Part of fix for libmedia OOB write anywhere" into lmp-dev

* commit '0ea1da27':
  DO NOT MERGE Part of fix for libmedia OOB write anywhere
parents 1c12b44c 0ea1da27

media/libmedia/ICrypto.cpp

+3 −3
Original line number Diff line number Diff line
@@ -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);