commit 23a5896ef2c1a0b26ce492c2ef0d8df238301e6f
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Nov 03 01:05:53 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Nov 03 01:05:53 2023 +0000
tree cd32a687e28d21bce96d2507d180bc1d65753b72
parent c7032527371f0e0ed7f0f51758e51e675283919a
parent 1f2f3de8ffeabe6d0816f3140cd5cb89840bb1a2

Merge "nullptr check on suffix." into main am: 1f2f3de8ff

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2815884

Change-Id: Ia8e5f8c60a21cb847e0abc35209ebcc019faa0cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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,