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

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

am 4ae700d2: am 160ed868: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into lmp-dev 

* commit '4ae700d2':
  DO NOT MERGE Fix vulnerability in mediaserver
parents 1ac11129 4ae700d2

media/libmedia/ICrypto.cpp

+2 −0
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ status_t BnCrypto::onTransact( 


            size_t totalSize = data.readInt32();

            void *srcData = malloc(totalSize);

            memset(srcData, 0, totalSize);

            data.read(srcData, totalSize);



            int32_t numSubSamples = data.readInt32();
@@ -262,6 +263,7 @@ status_t BnCrypto::onTransact( 
                secureBufferId = reinterpret_cast<void *>(static_cast<uintptr_t>(data.readInt64()));

            } else {

                dstPtr = malloc(totalSize);

                memset(dstPtr, 0, totalSize);

            }



            AString errorDetailMsg;