commit 1f2f3de8ffeabe6d0816f3140cd5cb89840bb1a2
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Nov 03 00:42:53 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 03 00:42:53 2023 +0000
tree 3230b82c87c85118c3a8ade29b5c934d112261f2
parent aa21941f474c12e391ce62a8959c34ed8a1ab653
parent 50adab945ac11a190dc6d04f585f7461f8d3185b

Merge "nullptr check on suffix." into main

opengl/libs/EGL/Loader.cpp

diff --git a/opengl/libs/EGL/Loader.cpp b/opengl/libs/EGL/Loader.cpp
index 3d31e67..e0ad6d9 100644
--- a/opengl/libs/EGL/Loader.cpp
+++ b/opengl/libs/EGL/Loader.cpp
@@ -494,7 +494,7 @@
     void* dso = nullptr;
 
     // Only use sphal namespace when system ANGLE binaries are not the default drivers.
-    const bool useSphalNamespace = strcmp(suffix, ANGLE_SUFFIX_VALUE) != 0;
+    const bool useSphalNamespace = suffix != nullptr && strcmp(suffix, ANGLE_SUFFIX_VALUE) != 0;
 
     const std::string absolutePath =
             findLibrary(libraryName, useSphalNamespace ? VENDOR_LIB_EGL_DIR : SYSTEM_LIB_PATH,