Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '97fb26c838340a7e21a7c3249940bc11df70c873':
  Fix Issue #35489: drm content corruption on GB
This commit is contained in:
Jean-Baptiste Queru
2012-08-16 15:35:14 -07:00
committed by Android Git Automerger
parent af101312c8 97fb26c838
commit df8d55c4aa
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/libdrm/mobile1/src/objmng/drm_api.c
View File

@@ -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;