diff options
| author | git-you.kim72.gmail.com <you.kim72@gmail.com> | 2012-07-30 17:06:41 +0900 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-08-13 15:03:48 -0700 |
| commit | fd20296c27fd95859d623a2bc23ac9b4799710e3 (patch) | |
| tree | 6496a5ffa70efdf51c94a1f8945f48b0d6fc3839 /media/libdrm/mobile1 | |
| parent | 28dba4fc394f0736e1d7bdf5601382c19c08f518 (diff) | |
| download | frameworks_base-fd20296c27fd95859d623a2bc23ac9b4799710e3.zip frameworks_base-fd20296c27fd95859d623a2bc23ac9b4799710e3.tar.gz frameworks_base-fd20296c27fd95859d623a2bc23ac9b4799710e3.tar.bz2 | |
Fix Issue #35489: drm content corruption on GB
If rawContent is copied into mediaBuf, readBuf is copied to wrong address.
mediaBuf should be forwarded by readBytes.
Change-Id: I4fc9c1f7f4e3d5dfe3c7e5cd92261608f6b3e248
Signed-off-by: git-you.kim72.gmail.com <you.kim72@gmail.com>
Diffstat (limited to 'media/libdrm/mobile1')
| -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; |