commit 3ef1b76f9c6156774c65f754f8f9d1e236756bb7
author Ady Abraham <adyabr@google.com> Thu Apr 30 10:26:33 2020 -0700
committer Ady Abraham <adyabr@google.com> Thu Apr 30 17:32:02 2020 +0000
tree 8880b2402324448ecbe8d86c50a75483eb962b62
parent 1b8793a693aaba1be177f1cfaf8932aa30ac0034

GLESRenderEngine: validate eglQueryStringImplementationANDROID for nullptr

Log fatal the EGL error in case eglQueryStringImplementationANDROID
returns nullptr;

Bug: 155272618
Test: boot
Change-Id: I4be7f798adfa7fdd7378dc509c847299f0539c7f

libs/renderengine/gl/GLESRenderEngine.cpp

diff --git a/libs/renderengine/gl/GLESRenderEngine.cpp b/libs/renderengine/gl/GLESRenderEngine.cpp
index b0b4f6c..92e7e71 100644
--- a/libs/renderengine/gl/GLESRenderEngine.cpp
+++ b/libs/renderengine/gl/GLESRenderEngine.cpp
@@ -208,9 +208,20 @@
         LOG_ALWAYS_FATAL("failed to initialize EGL");
     }
 
+    const auto eglVersion = eglQueryStringImplementationANDROID(display, EGL_VERSION);
+    if (!eglVersion) {
+        checkGlError(__FUNCTION__, __LINE__);
+        LOG_ALWAYS_FATAL("eglQueryStringImplementationANDROID(EGL_VERSION) failed");
+    }
+
+    const auto eglExtensions = eglQueryStringImplementationANDROID(display, EGL_EXTENSIONS);
+    if (!eglExtensions) {
+        checkGlError(__FUNCTION__, __LINE__);
+        LOG_ALWAYS_FATAL("eglQueryStringImplementationANDROID(EGL_EXTENSIONS) failed");
+    }
+
     GLExtensions& extensions = GLExtensions::getInstance();
-    extensions.initWithEGLStrings(eglQueryStringImplementationANDROID(display, EGL_VERSION),
-                                  eglQueryStringImplementationANDROID(display, EGL_EXTENSIONS));
+    extensions.initWithEGLStrings(eglVersion, eglExtensions);
 
     // The code assumes that ES2 or later is available if this extension is
     // supported.