commit c091dc79d80997ca527072a0a44c8fe0a1b0ff1d
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Feb 01 14:10:22 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Feb 01 14:10:22 2024 +0000
tree 85e836a791fec505c22f4cd3591b6987ef625a22
parent 16505b99ca1174b0cfb1d238788d6a18e11b4984
parent 511827318ffd7c866ec917f128f4901124700823

Snap for 11390602 from 511827318ffd7c866ec917f128f4901124700823 to mainline-art-release

Change-Id: I5f275efc4f0fc54b616b20ff3b8e5fdf2a942a81

system/OpenglSystemCommon/HostConnection.cpp

diff --git a/system/OpenglSystemCommon/HostConnection.cpp b/system/OpenglSystemCommon/HostConnection.cpp
index d130073..79c92fe 100644
--- a/system/OpenglSystemCommon/HostConnection.cpp
+++ b/system/OpenglSystemCommon/HostConnection.cpp
@@ -200,7 +200,14 @@
 
     virtual uint32_t getHostHandle(native_handle_t const* handle)
     {
-        return cb_handle_t::from(handle)->hostHandle;
+        const uint32_t INVALID_HOST_HANDLE = 0;
+
+        const cb_handle_t* cb = cb_handle_t::from(handle);
+        if (cb) {
+            return cb->hostHandle;
+        } else {
+            return INVALID_HOST_HANDLE;
+        }
     }
 
     virtual int getFormat(native_handle_t const* handle)