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

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

am d386c5be: Merge "Fix heap data leak vulnerability" into klp-dev

* commit 'd386c5be':
  Fix heap data leak vulnerability
parents 9860dcdf d386c5be
Loading
Loading
Loading
Loading
+10 −6
Original line number Diff line number Diff line
@@ -741,9 +741,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;
}
@@ -1438,9 +1440,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;