Program/ShaderGL: handle empty info logs

The GL driver can sometimes have an empty info log and return an info log length of 0. This would cause a vector to be initialized with a length of 0 just before it's .data() pointer was used, causing a segfault. BUG=angleproject:1323 Change-Id: Iaf9b569ec64a90c714a213562e427fb7cc8daa6b Reviewed-on: https://chromium-review.googlesource.com/330197Reviewed-by: Zhenyao Mo <zmo@chromium.org> Commit-Queue: Corentin Wallez <cwallez@chromium.org>

Program/ShaderGL: handle empty info logs
01ad6445 · Corentin Wallez · Commit Bot · 9cb1df4f · 01ad6445 · 01ad6445
Commit 01ad6445 authored Mar 03, 2016 by Corentin Wallez Committed by Commit Bot Mar 04, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 29 additions and 14 deletions

ProgramGL.cpp src/libANGLE/renderer/gl/ProgramGL.cpp +14 -6

ShaderGL.cpp src/libANGLE/renderer/gl/ShaderGL.cpp +15 -8

No files found.
--- a/src/libANGLE/renderer/gl/ProgramGL.cpp
+++ b/src/libANGLE/renderer/gl/ProgramGL.cpp
@@ -117,15 +117,23 @@ LinkResult ProgramGL::link(const gl::Data &data, gl::InfoLog &infoLog)
        GLint infoLogLength = 0;
        mFunctions->getProgramiv(mProgramID, GL_INFO_LOG_LENGTH, &infoLogLength);
-        std::vector<char> buf(infoLogLength);
+        std::string warning;
-        mFunctions->getProgramInfoLog(mProgramID, infoLogLength, nullptr, &buf[0]);
+        if (infoLogLength > 0)
+        {
+            std::vector<char> buf(infoLogLength);
+            mFunctions->getProgramInfoLog(mProgramID, infoLogLength, nullptr, &buf[0]);
-        mFunctions->deleteProgram(mProgramID);
+            mFunctions->deleteProgram(mProgramID);
-        mProgramID = 0;
+            mProgramID = 0;
-        infoLog << buf.data();
+            infoLog << buf.data();
-        std::string warning = FormatString("Program link failed unexpectedly: %s", buf.data());
+            warning = FormatString("Program link failed unexpectedly: %s", buf.data());
+        }
+        else
+        {
+            warning = "Program link failed unexpectedly with no info log.";
+        }
        ANGLEPlatformCurrent()->logWarning(warning.c_str());
        TRACE("\n%s", warning.c_str());

--- a/src/libANGLE/renderer/gl/ShaderGL.cpp
+++ b/src/libANGLE/renderer/gl/ShaderGL.cpp
@@ -77,14 +77,21 @@ bool ShaderGL::postTranslateCompile(gl::Compiler *compiler, std::string *infoLog
        GLint infoLogLength = 0;
        mFunctions->getShaderiv(mShaderID, GL_INFO_LOG_LENGTH, &infoLogLength);
-        std::vector<char> buf(infoLogLength);
+        if (infoLogLength > 0)
-        mFunctions->getShaderInfoLog(mShaderID, infoLogLength, nullptr, &buf[0]);
+        {
+            std::vector<char> buf(infoLogLength);
-        mFunctions->deleteShader(mShaderID);
+            mFunctions->getShaderInfoLog(mShaderID, infoLogLength, nullptr, &buf[0]);
-        mShaderID = 0;
+            mFunctions->deleteShader(mShaderID);
-        *infoLog = &buf[0];
+            mShaderID = 0;
-        TRACE("\n%s", infoLog->c_str());
+            *infoLog = &buf[0];
+            TRACE("\n%s", infoLog->c_str());
+        }
+        else
+        {
+            TRACE("\nShader compilation failed with no info log.");
+        }
        return false;
    }