From 64bb2aadd52102bf2dd9a3520167eec4d849d586 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Tue, 18 Feb 2025 10:20:03 -0500
Subject: [PATCH] tools: Add null check for struct ptrs in CToCpp wrapper (see
 #3836)

---
 tools/make_ctocpp_impl.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/make_ctocpp_impl.py b/tools/make_ctocpp_impl.py
index e3acf2cec..96a927f26 100644
--- a/tools/make_ctocpp_impl.py
+++ b/tools/make_ctocpp_impl.py
@@ -102,6 +102,10 @@ def make_ctocpp_function_impl_new(cls, name, func, base_scoped, version,
       result += '\n  auto* _struct = reinterpret_cast<'+\
                 func.parent.get_capi_name(version=version)+'*>(GetStruct());'
 
+    result += '\n  if (!_struct->' + func.get_capi_name() + ') {'\
+              '\n    return' + retval_default + ';'\
+              '\n  }\n'
+
   # add API hash check
   if func.has_attrib('api_hash_check'):
     result += '\n  const char* api_hash = cef_api_hash(CEF_API_VERSION, 0);'\