diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-16 14:45:12 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-08-16 14:45:12 -0700 |
| commit | d2fb6e99bda1ae607b5dfbb68905030f2133f8e8 (patch) | |
| tree | cdfee105c68e837abfcb9f3838c5aebe5593a3ba | |
| parent | 9b0da58e3a30b760de37138cdd51d20f269c383e (diff) | |
| parent | fd20296c27fd95859d623a2bc23ac9b4799710e3 (diff) | |
| download | frameworks_base-d2fb6e99bda1ae607b5dfbb68905030f2133f8e8.zip frameworks_base-d2fb6e99bda1ae607b5dfbb68905030f2133f8e8.tar.gz frameworks_base-d2fb6e99bda1ae607b5dfbb68905030f2133f8e8.tar.bz2 | |
Merge "Fix Issue #35489: drm content corruption on GB"
| -rw-r--r-- | media/libdrm/mobile1/src/objmng/drm_api.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libdrm/mobile1/src/objmng/drm_api.c b/media/libdrm/mobile1/src/objmng/drm_api.c index 249cdbe..232d9f4 100644 --- a/media/libdrm/mobile1/src/objmng/drm_api.c +++ b/media/libdrm/mobile1/src/objmng/drm_api.c @@ -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 (leftLen <= s->readBufLen) { - memcpy(mediaBuf, s->readBuf + s->readBufOff, leftLen); + memcpy(mediaBuf + readBytes, s->readBuf + s->readBufOff, leftLen); s->readBufOff += leftLen; s->readBufLen -= leftLen; readBytes += leftLen; leftLen = 0; } else { - memcpy(mediaBuf, s->readBuf + s->readBufOff, s->readBufLen); + memcpy(mediaBuf + readBytes, s->readBuf + s->readBufOff, s->readBufLen); s->readBufOff += s->readBufLen; leftLen -= s->readBufLen; readBytes += s->readBufLen; |