Merge pull request #73119 from akien-mga/math-posmod-no-div0

Math: Prevent division by zero in posmod
This commit is contained in:
Rémi Verschelde 2023-02-11 22:04:48 +01:00
commit bc08b48b6a
No known key found for this signature in database
GPG key ID: C3336907360768E1

View file

@ -31,6 +31,7 @@
#ifndef MATH_FUNCS_H #ifndef MATH_FUNCS_H
#define MATH_FUNCS_H #define MATH_FUNCS_H
#include "core/error/error_macros.h"
#include "core/math/math_defs.h" #include "core/math/math_defs.h"
#include "core/math/random_pcg.h" #include "core/math/random_pcg.h"
#include "core/typedefs.h" #include "core/typedefs.h"
@ -225,6 +226,7 @@ public:
} }
static _ALWAYS_INLINE_ int64_t posmod(int64_t p_x, int64_t p_y) { static _ALWAYS_INLINE_ int64_t posmod(int64_t p_x, int64_t p_y) {
ERR_FAIL_COND_V_MSG(p_y == 0, 0, "Division by zero in posmod is undefined. Returning 0 as fallback.");
int64_t value = p_x % p_y; int64_t value = p_x % p_y;
if (((value < 0) && (p_y > 0)) || ((value > 0) && (p_y < 0))) { if (((value < 0) && (p_y > 0)) || ((value > 0) && (p_y < 0))) {
value += p_y; value += p_y;