diff options
| author | Bernhard Liebl <Bernhard.Liebl@gmx.org> | 2018-01-03 12:29:58 +0100 |
|---|---|---|
| committer | poke1024 <poke1024@gmx.de> | 2018-01-10 18:41:47 +0100 |
| commit | a01c33c9d05719d8c0c6b93b4072a64b013a73d3 (patch) | |
| tree | 591edace7ae3f14e95097f63f5db9183825c5b21 | |
| parent | a60896869e6c17f674ff25bee87cabb54cd4403d (diff) | |
Object class checking on bound method calls
| -rw-r--r-- | core/method_bind.h | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/core/method_bind.h b/core/method_bind.h index 2e5712c3fe..21df65b40d 100644 --- a/core/method_bind.h +++ b/core/method_bind.h @@ -128,10 +128,36 @@ struct VariantCaster<const T &> { // Object enum casts must go here VARIANT_ENUM_CAST(Object::ConnectFlags); +template <typename T> +struct VariantObjectClassChecker { + static _FORCE_INLINE_ bool check(const Variant &p_variant) { + return true; + } +}; + +template <> +struct VariantObjectClassChecker<Node *> { + static _FORCE_INLINE_ bool check(const Variant &p_variant) { + Object *obj = p_variant; + Node *node = p_variant; + return node || !obj; + } +}; + +template <> +struct VariantObjectClassChecker<Control *> { + static _FORCE_INLINE_ bool check(const Variant &p_variant) { + Object *obj = p_variant; + Control *control = p_variant; + return control || !obj; + } +}; + #define CHECK_ARG(m_arg) \ if ((m_arg - 1) < p_arg_count) { \ Variant::Type argtype = get_argument_type(m_arg - 1); \ - if (!Variant::can_convert_strict(p_args[m_arg - 1]->get_type(), argtype)) { \ + if (!Variant::can_convert_strict(p_args[m_arg - 1]->get_type(), argtype) || \ + !VariantObjectClassChecker<P##m_arg>::check(*p_args[m_arg - 1])) { \ r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT; \ r_error.argument = m_arg - 1; \ r_error.expected = argtype; \ |