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

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

am 69c8327b: am 9dcb4c63: am 4ae700d2: am 160ed868: Merge "DO NOT MERGE Fix... 

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

* commit '69c8327b':
  DO NOT MERGE Fix vulnerability in mediaserver
parents faced8cd 69c8327b

media/libmedia/ICrypto.cpp

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




            size_t totalSize = data.readInt32();

            size_t totalSize = data.readInt32();

            void *srcData = malloc(totalSize);

            void *srcData = malloc(totalSize);

            memset(srcData, 0, totalSize);

            data.read(srcData, totalSize);

            data.read(srcData, totalSize);





            int32_t numSubSamples = data.readInt32();

            int32_t numSubSamples = data.readInt32();
@@ -262,6 +263,7 @@ status_t BnCrypto::onTransact( 
                secureBufferId = 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);

                memset(dstPtr, 0, totalSize);

            }

            }





            AString errorDetailMsg;

            AString errorDetailMsg;