From b16c4df31c779bccd518fa5103b73b1b6f778165 Mon Sep 17 00:00:00 2001
From: Refrag <R3FR4GYT@gmail.com>
Date: Mon, 20 May 2024 10:40:55 +0200
Subject: [PATCH] Ensure the servername fits into MAXSERVERNAME before setting
it
This commit adds a verification before setting the servername console
variable. We now check that it fits within the MAXSERVERNAME length and
we cancel setting it if it doesn't.
Letting the servername be more than MAXSERVERNAME could lead to crashes
when trying to edit the server name from the menu so, we now avoid
those.
---
src/netcode/mserv.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/netcode/mserv.c b/src/netcode/mserv.c
index 3acacd24c1..74ee120f96 100644
--- a/src/netcode/mserv.c
+++ b/src/netcode/mserv.c
@@ -50,6 +50,8 @@ static void Command_Listserv_f(void);
#endif/*MASTERSERVER*/
+static boolean ServerName_CanChange (const char*);
+
static void Update_parameters (void);
static void MasterServer_OnChange(void);
@@ -61,7 +63,7 @@ static CV_PossibleValue_t masterserver_update_rate_cons_t[] = {
};
consvar_t cv_masterserver = CVAR_INIT ("masterserver", "https://ds.ms.srb2.org/MS/0", CV_SAVE|CV_CALL, NULL, MasterServer_OnChange);
-consvar_t cv_servername = CVAR_INIT ("servername", "SRB2 server", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT|CV_ALLOWLUA, NULL, Update_parameters);
+consvar_t cv_servername = CVAR_INIT_WITH_CALLBACKS ("servername", "SRB2 server", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT|CV_ALLOWLUA, NULL, Update_parameters, ServerName_CanChange);
consvar_t cv_masterserver_update_rate = CVAR_INIT ("masterserver_update_rate", "15", CV_SAVE|CV_CALL|CV_NOINIT, masterserver_update_rate_cons_t, Update_parameters);
@@ -497,6 +499,15 @@ Set_api (const char *api)
#endif/*MASTERSERVER*/
+static boolean ServerName_CanChange(const char* newvalue)
+{
+ if (strlen(newvalue) < MAXSERVERNAME)
+ return true;
+
+ CONS_Alert(CONS_NOTICE, "The server name must be shorter than %d characters\n", MAXSERVERNAME);
+ return false;
+}
+
static void
Update_parameters (void)
{
--
GitLab