Commit 981afd7f by Geoff Lang

Fix possible crash when the info log length is zero.

BUG=angle:822 Change-Id: I01cb590cc9c1ba05f4d63dd088eef7e176a09d2f Reviewed-on: https://chromium-review.googlesource.com/227264Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Reviewed-by: 's avatarShannon Woods <shannonwoods@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent ad65a13c
...@@ -126,13 +126,19 @@ TYPED_TEST(ProgramBinaryTest, SaveAndLoadBinary) ...@@ -126,13 +126,19 @@ TYPED_TEST(ProgramBinaryTest, SaveAndLoadBinary)
GLint infoLogLength; GLint infoLogLength;
glGetProgramiv(program2, GL_INFO_LOG_LENGTH, &infoLogLength); glGetProgramiv(program2, GL_INFO_LOG_LENGTH, &infoLogLength);
if (infoLogLength > 0)
{
std::vector<GLchar> infoLog(infoLogLength); std::vector<GLchar> infoLog(infoLogLength);
glGetProgramInfoLog(program2, infoLog.size(), NULL, &infoLog[0]); glGetProgramInfoLog(program2, infoLog.size(), NULL, &infoLog[0]);
FAIL() << "program link failed: " << &infoLog[0]; FAIL() << "program link failed: " << &infoLog[0];
} }
else else
{ {
FAIL() << "program link failed.";
}
}
else
{
glUseProgram(program2); glUseProgram(program2);
glBindBuffer(GL_ARRAY_BUFFER, mBuffer); glBindBuffer(GL_ARRAY_BUFFER, mBuffer);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment