Merge pull request #75 from lifebeyondfife/OverflowProtection

feat(expression): protect overflow on bounds

Author: lifebeyondfife

.vscode/launch.json

@@ -9,7 +9,7 @@
              "type": "coreclr",
              "request": "launch",
              "preLaunchTask": "build-league-generation",
-             "program": "${workspaceFolder}/Examples/LeagueGeneration/bin/Debug/net6.0/LeagueGeneration.dll",
+             "program": "${workspaceFolder}/Examples/LeagueGeneration/bin/Debug/net8.0/LeagueGeneration.dll",
              "args": [],
              "cwd": "${workspaceFolder}/Examples/LeagueGeneration",
              "stopAtEntry": false,
@@ -20,7 +20,7 @@
              "type": "coreclr",
              "request": "launch",
              "preLaunchTask": "build-nqueens",
-             "program": "${workspaceFolder}/Examples/NQueens/bin/Debug/net6.0/NQueens.dll",
+             "program": "${workspaceFolder}/Examples/NQueens/bin/Debug/net8.0/NQueens.dll",
              "args": [],
              "cwd": "${workspaceFolder}/Examples/NQueens",
              "stopAtEntry": false,
@@ -31,7 +31,7 @@
              "type": "coreclr",
              "request": "launch",
              "preLaunchTask": "build-optimisation",
-             "program": "${workspaceFolder}/Examples/Optimisation/bin/Debug/net6.0/Optimisation.dll",
+             "program": "${workspaceFolder}/Examples/Optimisation/bin/Debug/net8.0/Optimisation.dll",
              "args": [],
              "cwd": "${workspaceFolder}/Examples/Optimisation",
              "stopAtEntry": false,
@@ -42,7 +42,7 @@
              "type": "coreclr",
              "request": "launch",
              "preLaunchTask": "build-phase-locked-loop",
-             "program": "${workspaceFolder}/Examples/PhaseLockedLoop/bin/Debug/net6.0/PhaseLockedLoop.dll",
+             "program": "${workspaceFolder}/Examples/PhaseLockedLoop/bin/Debug/net8.0/PhaseLockedLoop.dll",
              "args": [],
              "cwd": "${workspaceFolder}/Examples/PhaseLockedLoop",
              "stopAtEntry": false,
@@ -53,7 +53,7 @@
              "type": "coreclr",
              "request": "launch",
              "preLaunchTask": "build-send-more-money",
-             "program": "${workspaceFolder}/Examples/SendMoreMoney/bin/Debug/net6.0/SendMoreMoney.dll",
+             "program": "${workspaceFolder}/Examples/SendMoreMoney/bin/Debug/net8.0/SendMoreMoney.dll",
              "args": [],
              "cwd": "${workspaceFolder}/Examples/SendMoreMoney",
              "console": "internalConsole",
@@ -64,7 +64,7 @@
              "type": "coreclr",
              "request": "launch",
              "preLaunchTask": "build-teacher-timetable",
-             "program": "${workspaceFolder}/Examples/TeacherTimetable/bin/Debug/net6.0/TeacherTimetable.dll",
+             "program": "${workspaceFolder}/Examples/TeacherTimetable/bin/Debug/net8.0/TeacherTimetable.dll",
              "args": [],
              "cwd": "${workspaceFolder}/Examples/TeacherTimetable",
              "stopAtEntry": false,

Csp/Integer/ExpressionInteger.cs

@@ -23,8 +23,8 @@ public class ExpressionInteger : Expression<int>
 
 						return new Bounds<int>
 						(
-							leftBounds.LowerBound + rightBounds.LowerBound,
-							leftBounds.UpperBound + rightBounds.UpperBound
+							(int) Math.Max(int.MinValue, Math.Min(int.MaxValue, (long)leftBounds.LowerBound + rightBounds.LowerBound)),
+							(int) Math.Min(int.MaxValue, Math.Max(int.MinValue, (long)leftBounds.UpperBound + rightBounds.UpperBound))
 						);
 					},
 				propagator = (first, second, enforce) =>
@@ -74,8 +74,8 @@ public class ExpressionInteger : Expression<int>
 
 						return new Bounds<int>
 						(
-							leftBounds.LowerBound - rightBounds.UpperBound,
-							leftBounds.UpperBound - rightBounds.LowerBound
+							(int) Math.Max(int.MinValue, Math.Min(int.MaxValue, (long)leftBounds.LowerBound - rightBounds.UpperBound)),
+							(int) Math.Min(int.MaxValue, Math.Max(int.MinValue, (long)leftBounds.UpperBound - rightBounds.LowerBound))
 						);
 					},
 				propagator = (first, second, enforce) =>
@@ -142,8 +142,8 @@ public class ExpressionInteger : Expression<int>
 
 					return new Bounds<int>
 					(
-						leftBounds.LowerBound / rightBounds.UpperBound,
-						leftBounds.UpperBound / rightBounds.LowerBound
+						rightBounds.UpperBound == 0 ? (leftBounds.LowerBound >= 0 ? int.MaxValue : int.MinValue) : leftBounds.LowerBound / rightBounds.UpperBound,
+						rightBounds.LowerBound == 0 ? (leftBounds.UpperBound >= 0 ? int.MaxValue : int.MinValue) : leftBounds.UpperBound / rightBounds.LowerBound
 					);
 				},
 				propagator = (first, second, enforce) =>
@@ -199,8 +199,8 @@ public class ExpressionInteger : Expression<int>
 
 					return new Bounds<int>
 					(
-						leftBounds.LowerBound * rightBounds.LowerBound,
-						leftBounds.UpperBound * rightBounds.UpperBound
+						(leftBounds.LowerBound == 0 || rightBounds.LowerBound == 0) ? 0 : ((leftBounds.LowerBound < 0) != (rightBounds.LowerBound < 0) && Math.Abs((long)leftBounds.LowerBound) > int.MaxValue / Math.Abs((long)rightBounds.LowerBound)) ? int.MinValue : leftBounds.LowerBound * rightBounds.LowerBound,
+						(leftBounds.UpperBound > 0 && rightBounds.UpperBound > 0 && leftBounds.UpperBound > int.MaxValue / rightBounds.UpperBound) ? int.MaxValue : leftBounds.UpperBound * rightBounds.UpperBound
 					);
 				},
 				propagator = (first, second, enforce) =>