From cdf1cba1060a0ccb50597fc19c064caf3a5d72af Mon Sep 17 00:00:00 2001 From: Yamagi Date: Fri, 20 Dec 2024 15:24:27 +0100 Subject: [PATCH 1/2] Correct `strncmp()` checks in download code. Reported by @m-x-d, closes #1167. --- src/server/sv_user.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server/sv_user.c b/src/server/sv_user.c index b4efe79e..8ef6f655 100644 --- a/src/server/sv_user.c +++ b/src/server/sv_user.c @@ -314,13 +314,13 @@ SV_BeginDownload_f(void) /* leading slash bad as well, must be in subdir */ || (*name == '/') /* next up, skin check */ - || ((strncmp(name, "players/", 6) == 0) && !allow_download_players->value) + || ((strncmp(name, "players/", 8) == 0) && !allow_download_players->value) /* now models */ - || ((strncmp(name, "models/", 6) == 0) && !allow_download_models->value) + || ((strncmp(name, "models/", 7) == 0) && !allow_download_models->value) /* now sounds */ || ((strncmp(name, "sound/", 6) == 0) && !allow_download_sounds->value) /* now maps (note special case for maps, must not be in pak) */ - || ((strncmp(name, "maps/", 6) == 0) && !allow_download_maps->value) + || ((strncmp(name, "maps/", 5) == 0) && !allow_download_maps->value) /* MUST be in a subdirectory */ || !strstr(name, "/")) { From 8c8488657c889ad3e9eb7909030df0212f47eb5c Mon Sep 17 00:00:00 2001 From: Yamagi Date: Fri, 20 Dec 2024 15:30:32 +0100 Subject: [PATCH 2/2] Fix less planes reserved for hull box testing than used down below. This is an original bug, already present in Vanilla Quake 2. Reported by @m-x-d, closes #1171. --- src/common/collision.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/collision.c b/src/common/collision.c index 91e96121..a8aa71c1 100644 --- a/src/common/collision.c +++ b/src/common/collision.c @@ -82,7 +82,7 @@ static cleaf_t map_leafs[MAX_MAP_LEAFS]; static cmodel_t map_cmodels[MAX_MAP_MODELS]; static cnode_t map_nodes[MAX_MAP_NODES+6]; /* extra for box hull */ static cplane_t *box_planes; -static cplane_t map_planes[MAX_MAP_PLANES+6]; /* extra for box hull */ +static cplane_t map_planes[MAX_MAP_PLANES+12]; /* extra for box hull */ static cvar_t *map_noareas; static dareaportal_t map_areaportals[MAX_MAP_AREAPORTALS]; static dvis_t *map_vis = (dvis_t *)map_visibility;