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

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

am 78f7932d: am 7b642b08: am 0af50080: am 8ba28c84: am d61dbb36: am 38281f1c:... 

am 78f7932d: am 7b642b08: am 0af50080: am 8ba28c84: am d61dbb36: am 38281f1c: am d386c5be: Merge "Fix heap data leak vulnerability" into klp-dev

* commit '78f7932d':
  Fix heap data leak vulnerability
parents 3662ca10 78f7932d

drm/common/IDrmManagerService.cpp

+10 −6
Original line number Diff line number Diff line
@@ -742,9 +742,11 @@ status_t BpDrmManagerService::decrypt( 
    const status_t status = reply.readInt32();

    ALOGV("Return value of decrypt() is %d", status);



    if (status == NO_ERROR) {

        const int size = reply.readInt32();

        (*decBuffer)->length = size;

        reply.read((void *)(*decBuffer)->data, size);

    }



    return status;

}
@@ -1470,9 +1472,11 @@ status_t BnDrmManagerService::onTransact( 


        reply->writeInt32(status);



        if (status == NO_ERROR) {

            const int size = decBuffer->length;

            reply->writeInt32(size);

            reply->write(decBuffer->data, size);

        }



        clearDecryptHandle(&handle);

        delete encBuffer; encBuffer = NULL;