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

Commit f39d5164 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am df8d55c4: am 97fb26c8: am b18bcf13: am d2fb6e99: Merge "Fix Issue #35489:... 

am df8d55c4: am 97fb26c8: am b18bcf13: am d2fb6e99: Merge "Fix Issue #35489: drm content corruption on GB"

* commit 'df8d55c4':
  Fix Issue #35489: drm content corruption on GB
parents 7abab32c df8d55c4

media/libdrm/mobile1/src/objmng/drm_api.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1478,13 +1478,13 @@ static int32_t drm_readBinaryContentFromInputStream(T_DRM_Session_Node* s, int32 




    if (NULL != s->readBuf && s->readBufLen > 0) { /* read from backup buffer */

    if (NULL != s->readBuf && s->readBufLen > 0) { /* read from backup buffer */

        if (leftLen <= s->readBufLen) {

        if (leftLen <= s->readBufLen) {

            memcpy(mediaBuf, s->readBuf + s->readBufOff, leftLen);

            memcpy(mediaBuf + readBytes, s->readBuf + s->readBufOff, leftLen);

            s->readBufOff += leftLen;

            s->readBufOff += leftLen;

            s->readBufLen -= leftLen;

            s->readBufLen -= leftLen;

            readBytes += leftLen;

            readBytes += leftLen;

            leftLen = 0;

            leftLen = 0;

        } else {

        } else {

            memcpy(mediaBuf, s->readBuf + s->readBufOff, s->readBufLen);

            memcpy(mediaBuf + readBytes, s->readBuf + s->readBufOff, s->readBufLen);

            s->readBufOff += s->readBufLen;

            s->readBufOff += s->readBufLen;

            leftLen -= s->readBufLen;

            leftLen -= s->readBufLen;

            readBytes += s->readBufLen;

            readBytes += s->readBufLen;