| commit | 4de4fd6ee7f66d9f8cb341422f410cd965f0310c | [log] [tgz] |
|---|---|---|
| author | Shannon Woods <shannonwoods@chromium.org> | Fri Nov 07 16:22:02 2014 -0500 |
| committer | Shannon Woods <shannonwoods@chromium.org> | Mon Nov 10 19:50:45 2014 +0000 |
| tree | 57ac3e29dbe870001a5c469ddb57110aea22f4b0 | |
| parent | 93e13fbf66943bb3a83966cb295b3d97810282ab [diff] [blame] |
Fixes a bug in program ID validation for GetUniform* calls. BUG=angle:571 Change-Id: I7080f0f7ea0def29d1b67c9d954ee5d9d41fb348 Reviewed-on: https://chromium-review.googlesource.com/228560 Reviewed-by: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Shannon Woods <shannonwoods@chromium.org>
diff --git a/src/libGLESv2/validationES.cpp b/src/libGLESv2/validationES.cpp index 9146be3..265f4b4 100644 --- a/src/libGLESv2/validationES.cpp +++ b/src/libGLESv2/validationES.cpp
@@ -1879,6 +1879,11 @@ return false; } + if (!ValidProgram(context, program)) + { + return false; + } + gl::Program *programObject = context->getProgram(program); if (!programObject || !programObject->isLinked())