mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-27 11:24:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #95172 from Chaosus/gdscript_fix_vector_division_by_zero_crash

Browse Source 
Fix crash when division by zero/modulo by zero happen on vectors
This commit is contained in:
Thaddeus Crews 2024-11-21 17:56:44 -06:00
commit d11c1a4c00
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
5 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/gdscript/gdscript_byte_codegen.cpp
View File

@ -585,8 +585,25 @@ void GDScriptByteCodeGenerator::write_unary_operator(const Address &p_target, Va
}
void GDScriptByteCodeGenerator::write_binary_operator(const Address &p_target, Variant::Operator p_operator, const Address &p_left_operand, const Address &p_right_operand) {
// Avoid validated evaluator for modulo and division when operands are int, since there's no check for division by zero.
if (HAS_BUILTIN_TYPE(p_left_operand) && HAS_BUILTIN_TYPE(p_right_operand) && ((p_operator != Variant::OP_DIVIDE && p_operator != Variant::OP_MODULE) || p_left_operand.type.builtin_type != Variant::INT || p_right_operand.type.builtin_type != Variant::INT)) {
bool valid = HAS_BUILTIN_TYPE(p_left_operand) && HAS_BUILTIN_TYPE(p_right_operand);
// Avoid validated evaluator for modulo and division when operands are int or integer vector, since there's no check for division by zero.
if (valid && (p_operator == Variant::OP_DIVIDE || p_operator == Variant::OP_MODULE)) {
switch (p_left_operand.type.builtin_type) {
case Variant::INT:
valid = p_right_operand.type.builtin_type != Variant::INT;
break;
case Variant::VECTOR2I:
case Variant::VECTOR3I:
case Variant::VECTOR4I:
valid = p_right_operand.type.builtin_type != Variant::INT && p_right_operand.type.builtin_type != p_left_operand.type.builtin_type;
break;
default:
break;
}
}
if (valid) {
if (p_target.mode == Address::TEMPORARY) {
Variant::Type result_type = Variant::get_operator_return_type(p_operator, p_left_operand.type.builtin_type, p_right_operand.type.builtin_type);
Variant::Type temp_type = temporaries[p_target.address].type;

3
modules/gdscript/tests/scripts/runtime/errors/division_by_zero.gd Normal file
View File

@ -0,0 +1,3 @@
func test():
var integer: int = 1
integer /= 0

6
modules/gdscript/tests/scripts/runtime/errors/division_by_zero.out Normal file
View File

@ -0,0 +1,6 @@
GDTEST_RUNTIME_ERROR
>> SCRIPT ERROR
>> on function: test()
>> runtime/errors/division_by_zero.gd
>> 3
>> Division by zero error in operator '/'.

3
modules/gdscript/tests/scripts/runtime/errors/modulo_by_zero.gd Normal file
View File

@ -0,0 +1,3 @@
func test():
var integer: int = 1
integer %= 0

6
modules/gdscript/tests/scripts/runtime/errors/modulo_by_zero.out Normal file
View File

@ -0,0 +1,6 @@
GDTEST_RUNTIME_ERROR
>> SCRIPT ERROR
>> on function: test()
>> runtime/errors/modulo_by_zero.gd
>> 3
>> Modulo by zero error in operator '%'.