Speculative fix: getProgramiv always returns a valid program

The only possibility with program being nullptr here in the case of GL_LINK_STATUS seems to be if the context gets lost between the validation and usage of `Context::getProgramiv`. Bug: chromium:991020 Change-Id: I50a77ca4a841dea7324344a71e46d4e0bf72858d Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2096176Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Shrek Shao <shrekshao@google.com> Commit-Queue: Shrek Shao <shrekshao@google.com>

Speculative fix: getProgramiv always returns a valid program
84780f7d · shrekshao · Commit Bot · 2e5bd9b1 · 84780f7d · 84780f7d
Commit 84780f7d authored Mar 11, 2020 by shrekshao Committed by Commit Bot Mar 12, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 7 deletions

Context.cpp src/libANGLE/Context.cpp +5 -6

queryutils.cpp src/libANGLE/queryutils.cpp +1 -1

No files found.
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -6497,14 +6497,13 @@ void Context::getIntegervRobust(GLenum pname, GLsizei bufSize, GLsizei *length, 
 void Context::getProgramiv(ShaderProgramID program, GLenum pname, GLint *params)
 {
-    Program *programObject = nullptr;
+    // Don't resolve link if checking the link completion status.
-    if (!isContextLost())
+    Program *programObject = getProgramNoResolveLink(program);
+    if (!isContextLost() && pname != GL_COMPLETION_STATUS_KHR)
    {
-        // Don't resolve link if checking the link completion status.
+        programObject = getProgramResolveLink(program);
-        programObject = (pname == GL_COMPLETION_STATUS_KHR ? getProgramNoResolveLink(program)
-                                                           : getProgramResolveLink(program));
-        ASSERT(programObject);
    }
+    ASSERT(programObject);
    QueryProgramiv(this, programObject, pname, params);
 }

--- a/src/libANGLE/queryutils.cpp
+++ b/src/libANGLE/queryutils.cpp
@@ -1195,7 +1195,7 @@ void QueryProgramiv(Context *context, const Program *program, GLenum pname, GLin
            *params = program->isFlaggedForDeletion();
            return;
        case GL_LINK_STATUS:
-            *params = program ? program->isLinked() : false;
+            *params = program->isLinked();
            return;
        case GL_COMPLETION_STATUS_KHR:
            if (context->isContextLost())