From 5c508b351a95f416e4a599f76902b888369de1b4 Mon Sep 17 00:00:00 2001
From: Renaud Guezennec <renaud@rolisteam.org>
Date: Sat, 28 Dec 2024 15:00:29 +0100
Subject: Several fix from fuzzer test.

---
 src/libparser/booleancondition.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/libparser/booleancondition.cpp')

diff --git a/src/libparser/booleancondition.cpp b/src/libparser/booleancondition.cpp
index ab5b15d..12fb54b 100644
--- a/src/libparser/booleancondition.cpp
+++ b/src/libparser/booleancondition.cpp
@@ -93,6 +93,8 @@ BooleanCondition::~BooleanCondition()
 }
 qint64 BooleanCondition::hasValid(Die* b, bool recursive, bool unhighlight) const
 {
+    if(!b)
+        return 0;
     QList<qint64> listValues;
     if(m_conditionType == Dice::OnEachValue)
     {
@@ -185,7 +187,7 @@ Dice::CONDITION_STATE BooleanCondition::isValidRangeSize(const std::pair<qint64,
 {
     Dice::CONDITION_STATE state;
     auto valueScalar= valueToScalar();
-    qint64 boundValue= qBound(range.first, valueScalar, range.second);
+    qint64 boundValue= qBound(std::min(range.first, range.second), valueScalar, std::max(range.first, range.second));
     bool isInsideRange= (boundValue == valueScalar);
     switch(m_operator)
     {
-- 
cgit v1.2.3-70-g09d2