commit 74f5930e62f1ee8430b915561dafc5e27eb72440
author James Dong <jdong@google.com> Sat Dec 19 08:26:03 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Sat Dec 19 08:26:03 2009 -0800
tree 935174efb7ab3e6f273573cf96df95f2f7ebb9dc
parent 288fa08d80697317521fb15852385ff083d15ca7
parent bd1865f659d94a884f0fd05d0b345c2ba5219fc7

am 4e4795c8: Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable

Merge commit '4e4795c8c0934eb063048471037ecb8a713e85fd' into eclair-mr2-plus-aosp

* commit '4e4795c8c0934eb063048471037ecb8a713e85fd':
  Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable

opengl/libagl/egl.cpp

diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp
index 781b8c3..81864bd 100644
--- a/opengl/libagl/egl.cpp
+++ b/opengl/libagl/egl.cpp
@@ -1205,7 +1205,7 @@
                 gConfigManagement,
                 0, NELEM(gConfigManagement)-1,
                 attr);
-        if (index >= 0) {
+        if (cfgMgtIndex >= 0) {
             bool match = gConfigManagement[cfgMgtIndex].match(
                     val, configFound[index].value);
             if (match) {