From 2f958ad3f8b58d4cd29b6cdb8ae36d9c33c73834 Mon Sep 17 00:00:00 2001
From: Bo Hu <bohu@google.com>
Date: Thu, 21 Mar 2024 13:42:25 -0700
Subject: [PATCH] goldfish: handle null handle

Reviewed-by: Aaron Ruby <aruby@blackberry.com>
Acked-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27246>
---
 src/gfxstream/guest/android/GrallocGoldfish.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/gfxstream/guest/android/GrallocGoldfish.cpp b/src/gfxstream/guest/android/GrallocGoldfish.cpp
index f07abde90ae..c46612bf302 100644
--- a/src/gfxstream/guest/android/GrallocGoldfish.cpp
+++ b/src/gfxstream/guest/android/GrallocGoldfish.cpp
@@ -44,7 +44,14 @@ void GoldfishGralloc::acquire(AHardwareBuffer* ahb) { AHardwareBuffer_acquire(ah
 void GoldfishGralloc::release(AHardwareBuffer* ahb) { AHardwareBuffer_release(ahb); }
 
 uint32_t GoldfishGralloc::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;
+    }
 }
 
 uint32_t GoldfishGralloc::getHostHandle(const AHardwareBuffer* ahb) {