Sara.Sync
/
godot-cpp
mirror of https://github.com/godotengine/godot-cpp
0
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add protections against registering classes that didn't use GDCLASS()

pull/1279/head
David Snopek 2023-10-21 17:54:46 -05:00
parent 0a6a19e33b
commit a61cdc8860
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/godot_cpp/classes/wrapped.hpp
View File

@ -202,6 +202,8 @@ protected:
} \ } \
\ \
public: \ public: \
typedef m_class self_type; \
\
static void initialize_class() { \ static void initialize_class() { \
static bool initialized = false; \ static bool initialized = false; \
if (initialized) { \ if (initialized) { \
@ -395,6 +397,10 @@ protected:
return nullptr; \ return nullptr; \
} \ } \
\ \
static inline bool has_get_property_list() { \
return false; \
} \
\
static void (Wrapped::*_get_get_property_list())(List<PropertyInfo> * p_list) const { \ static void (Wrapped::*_get_get_property_list())(List<PropertyInfo> * p_list) const { \
return nullptr; \ return nullptr; \
} \ } \
@ -416,6 +422,8 @@ protected:
} \ } \
\ \
public: \ public: \
typedef m_class self_type; \
\
static void initialize_class() {} \ static void initialize_class() {} \
\ \
static ::godot::StringName &get_class_static() { \ static ::godot::StringName &get_class_static() { \
@ -425,6 +433,17 @@ public:
\ \
static ::godot::StringName &get_parent_class_static() { \ static ::godot::StringName &get_parent_class_static() { \
return m_inherits::get_class_static(); \ return m_inherits::get_class_static(); \
} \
\
static GDExtensionObjectPtr create(void *data) { \
return nullptr; \
} \
\
static GDExtensionClassInstancePtr recreate(void *data, GDExtensionObjectPtr obj) { \
return nullptr; \
} \
\
static void free(void *data, GDExtensionClassInstancePtr ptr) { \
} \ } \
\ \
static void *_gde_binding_create_callback(void *p_token, void *p_instance) { \ static void *_gde_binding_create_callback(void *p_token, void *p_instance) { \

1
include/godot_cpp/core/class_db.hpp
View File

@ -170,6 +170,7 @@ public:
template <class T, bool is_abstract> template <class T, bool is_abstract>
void ClassDB::_register_class(bool p_virtual, bool p_exposed) { void ClassDB::_register_class(bool p_virtual, bool p_exposed) {
static_assert(TypesAreSame<typename T::self_type, T>::value, "Class not declared properly, please use GDCLASS.");
instance_binding_callbacks[T::get_class_static()] = &T::_gde_binding_callbacks; instance_binding_callbacks[T::get_class_static()] = &T::_gde_binding_callbacks;
// Register this class within our plugin // Register this class within our plugin