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

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

am c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhere 

* commit 'c2153d0d':
  DO NOT MERGE Part of fix for libmedia OOB write anywhere
parents f839b2a3 c2153d0d

media/libmedia/ICrypto.cpp

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