From: terencehill <piuntn@gmail.com>
Date: Sun, 23 Mar 2025 18:01:54 +0000 (+0100)
Subject: Fix #2919 "Crash when loading bots on map soylent_ctf_reloaded_v1r1"
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2Fterencehill%2Fbot_waypoint_fixes;p=xonotic%2Fxonotic-data.pk3dir.git

Fix #2919 "Crash when loading bots on map soylent_ctf_reloaded_v1r1"

Malformed waypoints now trigger a qc crash instead of an engine crash warning that waypoint file needs fixing
---

diff --git a/qcsrc/server/bot/default/waypoints.qc b/qcsrc/server/bot/default/waypoints.qc
index 0b297e6ed..9ed3a00a8 100644
--- a/qcsrc/server/bot/default/waypoints.qc
+++ b/qcsrc/server/bot/default/waypoints.qc
@@ -1903,6 +1903,12 @@ float waypoint_loadall()
 		if (!s)
 			break;
 		m2 = stov(s);
+		if (m1.x > m2.x || m1.y > m2.y || m1.z > m2.z)
+		{
+			fclose(file);
+			error(sprintf("Backwards mins/maxs in %s. Waypoint file must be removed or fixed.", filename));
+		}
+
 		s = fgets(file);
 		if (!s)
 			break;