commit b18bcf13fd47102a2527e599cde0b1d59ab7c51e
author Jean-Baptiste Queru <jbq@google.com> Thu Aug 16 15:29:47 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 16 15:29:47 2012 -0700
tree 1dd77adf4d95df41050dcbf78962edb5e136b328
parent a2e8365cc883de0d3e56e9f4af350ecfe1b8fc4c
parent d2fb6e99bda1ae607b5dfbb68905030f2133f8e8

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

* commit 'd2fb6e99bda1ae607b5dfbb68905030f2133f8e8':
  Fix Issue #35489: drm content corruption on GB

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

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