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

Commit e2abaffe authored by Jeff Tinker's avatar Jeff Tinker Committed by Android Git Automerger
Browse files

am 3cef9257: Merge "Part of fix for libmedia OOB write anywhere" into mnc-dev 

* commit '3cef9257':
  Part of fix for libmedia OOB write anywhere
parents 50dbdc80 3cef9257

media/libmedia/ICrypto.cpp

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

            }
@@ -313,7 +313,7 @@ status_t BnCrypto::onTransact( 
                    mode,

                    sharedBuffer, offset,

                    subSamples, numSubSamples,

                    dstPtr,

                    secure ? secureBufferId : dstPtr,

                    &errorDetailMsg);

            }