Merge branch 'master' into jumping

silvigon · Feb 14, 2025 · 74eda32 · 74eda32
2 parents 6690513 + 973d34a
commit 74eda32
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/assembler/expreval.cpp b/src/assembler/expreval.cpp
@@ -240,7 +240,13 @@ VIntS evaluate(const std::shared_ptr<Expr> &expr,
   }
   FiExpr;
   IfExpr(Div, v) {
-    return evaluate(v->lhs, variables) / evaluate(v->rhs, variables);
+    auto rhs_value = evaluate(v->rhs, variables);
+    if (rhs_value == 0) {
+      throw std::runtime_error(
+          "Division by zero error in expression evaluation.");
+    }
+
+    return evaluate(v->lhs, variables) / rhs_value;
   }
   FiExpr;
   IfExpr(Mul, v) {
@@ -252,7 +258,13 @@ VIntS evaluate(const std::shared_ptr<Expr> &expr,
   }
   FiExpr;
   IfExpr(Mod, v) {
-    return evaluate(v->lhs, variables) % evaluate(v->rhs, variables);
+    auto rhs_value = evaluate(v->rhs, variables);
+    if (rhs_value == 0) {
+      throw std::runtime_error(
+          "Modulo by zero error in expression evaluation.");
+    }
+
+    return evaluate(v->lhs, variables) % rhs_value;
   }
   FiExpr;
   IfExpr(And, v) {