diff options
| author | Rafał Mikrut <mikrutrafal@protonmail.com> | 2021-02-09 16:14:50 +0100 |
|---|---|---|
| committer | Rafał Mikrut <mikrutrafal@protonmail.com> | 2021-03-04 16:25:40 +0100 |
| commit | 2cbdcb03a1a5d4b7a1b64ce85892cf655c3e229b (patch) | |
| tree | 3359e9d181168e85f9298d4e0a93730d732f84be | |
| parent | df9c98e107b19fc50bc5ae9f7ed624d693c0fb32 (diff) | |
Don't allow to use in bit shift negative operands
| -rw-r--r-- | core/variant/variant_op.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/core/variant/variant_op.cpp b/core/variant/variant_op.cpp index e0a3cf4215..99680539a3 100644 --- a/core/variant/variant_op.cpp +++ b/core/variant/variant_op.cpp @@ -257,6 +257,14 @@ public: static void evaluate(const Variant &p_left, const Variant &p_right, Variant *r_ret, bool &r_valid) { const A &a = *VariantGetInternalPtr<A>::get_ptr(&p_left); const B &b = *VariantGetInternalPtr<B>::get_ptr(&p_right); + +#if defined(DEBUG_ENABLED) + if (b < 0 || a < 0) { + *r_ret = "Invalid operands for bit shifting. Only positive operands are supported."; + r_valid = false; + return; + } +#endif *r_ret = a << b; r_valid = true; } @@ -276,6 +284,14 @@ public: static void evaluate(const Variant &p_left, const Variant &p_right, Variant *r_ret, bool &r_valid) { const A &a = *VariantGetInternalPtr<A>::get_ptr(&p_left); const B &b = *VariantGetInternalPtr<B>::get_ptr(&p_right); + +#if defined(DEBUG_ENABLED) + if (b < 0 || a < 0) { + *r_ret = "Invalid operands for bit shifting. Only positive operands are supported."; + r_valid = false; + return; + } +#endif *r_ret = a >> b; r_valid = true; } |