am f83c2720: am 16cfa2e3: Merge "SurfaceTexture: fix an out of bounds array write" into jb-mr1-dev

* commit 'f83c2720c1aab9c361e8240575386081d5f496af':
  SurfaceTexture: fix an out of bounds array write
This commit is contained in:
Jamie Gennis 2012-09-24 00:49:26 -07:00 committed by Android Git Automerger
commit cb8156e003

View File

@ -200,7 +200,7 @@ status_t SurfaceTexture::releaseBufferLocked(int buf, EGLDisplay display,
status_t err = ConsumerBase::releaseBufferLocked(buf, mEglDisplay, status_t err = ConsumerBase::releaseBufferLocked(buf, mEglDisplay,
eglFence); eglFence);
mEglSlots[mCurrentTexture].mEglFence = EGL_NO_SYNC_KHR; mEglSlots[buf].mEglFence = EGL_NO_SYNC_KHR;
return err; return err;
} }