diff options
Diffstat (limited to 'core/variant/variant_utility.cpp')
| -rw-r--r-- | core/variant/variant_utility.cpp | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/core/variant/variant_utility.cpp b/core/variant/variant_utility.cpp index 042ebe368a..a6363039ba 100644 --- a/core/variant/variant_utility.cpp +++ b/core/variant/variant_utility.cpp @@ -542,7 +542,18 @@ struct VariantUtilityFunctions { } Variant base = *p_args[0]; Variant ret; - for (int i = 1; i < p_argcount; i++) { + + for (int i = 0; i < p_argcount; i++) { + Variant::Type arg_type = p_args[i]->get_type(); + if (arg_type != Variant::INT && arg_type != Variant::FLOAT) { + r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; + r_error.expected = Variant::FLOAT; + r_error.argument = i; + return Variant(); + } + if (i == 0) { + continue; + } bool valid; Variant::evaluate(Variant::OP_LESS, base, *p_args[i], ret, valid); if (!valid) { @@ -575,7 +586,18 @@ struct VariantUtilityFunctions { } Variant base = *p_args[0]; Variant ret; - for (int i = 1; i < p_argcount; i++) { + + for (int i = 0; i < p_argcount; i++) { + Variant::Type arg_type = p_args[i]->get_type(); + if (arg_type != Variant::INT && arg_type != Variant::FLOAT) { + r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; + r_error.expected = Variant::FLOAT; + r_error.argument = i; + return Variant(); + } + if (i == 0) { + continue; + } bool valid; Variant::evaluate(Variant::OP_GREATER, base, *p_args[i], ret, valid); if (!valid) { |