diff options
author | Jamie Gennis <jgennis@google.com> | 2012-09-21 13:43:23 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-21 13:43:24 -0700 |
commit | 16cfa2e38bfbdafdba21af7f9f1c4d1418cbe1d3 (patch) | |
tree | 9ae749672de1a5657ce7fbaad2a35d5bf0f7c814 | |
parent | e0606e29875a55dedc1a4f0a738d5eb40fe1eb41 (diff) | |
parent | d1b330de416adff0d178a5cb7271419d9ed7a89a (diff) | |
download | frameworks_native-16cfa2e38bfbdafdba21af7f9f1c4d1418cbe1d3.zip frameworks_native-16cfa2e38bfbdafdba21af7f9f1c4d1418cbe1d3.tar.gz frameworks_native-16cfa2e38bfbdafdba21af7f9f1c4d1418cbe1d3.tar.bz2 |
Merge "SurfaceTexture: fix an out of bounds array write" into jb-mr1-dev
-rw-r--r-- | libs/gui/SurfaceTexture.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp index f2e9077..cbd8c79 100644 --- a/libs/gui/SurfaceTexture.cpp +++ b/libs/gui/SurfaceTexture.cpp @@ -200,7 +200,7 @@ status_t SurfaceTexture::releaseBufferLocked(int buf, EGLDisplay display, status_t err = ConsumerBase::releaseBufferLocked(buf, mEglDisplay, eglFence); - mEglSlots[mCurrentTexture].mEglFence = EGL_NO_SYNC_KHR; + mEglSlots[buf].mEglFence = EGL_NO_SYNC_KHR; return err; } |