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

Commit 8cc71bc8 authored by Abhishek Arya's avatar Abhishek Arya Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Part of fix for libmedia OOB write anywhere" into lmp-dev

parents 00880781 aa4da6fa

media/libmedia/ICrypto.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -247,9 +247,9 @@ status_t BnCrypto::onTransact( 
                    subSamples,

                    subSamples,

                    sizeof(CryptoPlugin::SubSample) * numSubSamples);

                    sizeof(CryptoPlugin::SubSample) * numSubSamples);





            void *dstPtr;

            void *secureBufferId, *dstPtr;

            if (secure) {

            if (secure) {

                dstPtr = reinterpret_cast<void *>(static_cast<uintptr_t>(data.readInt64()));

                secureBufferId = reinterpret_cast<void *>(static_cast<uintptr_t>(data.readInt64()));

            } else {

            } else {

                dstPtr = malloc(totalSize);

                dstPtr = malloc(totalSize);

            }

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

                    mode,

                    srcData,

                    srcData,

                    subSamples, numSubSamples,

                    subSamples, numSubSamples,

                    dstPtr,

                    secure ? secureBufferId : dstPtr,

                    &errorDetailMsg);

                    &errorDetailMsg);





            reply->writeInt32(result);

            reply->writeInt32(result);