From 7168c5e503b236bde2b92ae447ecbbbeddb6bb81 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 2 Feb 2026 17:21:36 +0100 Subject: [PATCH] do not use Zone Memory for masterserver rules this gets called from within non main threads! zone memory is not thread safe! --- src/m_menu.c | 3 +-- src/mserv.c | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index f15d9bf6a..7cec18f30 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -5369,7 +5369,7 @@ void M_PopupMasterServerRules(void) { firstDismissedRulesThisBoot = false; M_StartMessage(va("%s\n(press any key)", rules), NULL, MM_NOTHING); - Z_Free(rules); + free(rules); } } #endif @@ -7608,7 +7608,6 @@ static void M_DrawLevelSelectOnly(boolean leftfade, boolean rightfade) static void M_DrawServerMenu(void) { - M_DrawLevelSelectOnly(false, false); #ifdef MASTERSERVER if (currentMenu == &MP_ServerDef && cv_advertise.value) // Remind players where they're hosting. diff --git a/src/mserv.c b/src/mserv.c index c8f7a0af9..74b6e6329 100644 --- a/src/mserv.c +++ b/src/mserv.c @@ -219,8 +219,9 @@ static void Get_masterserver_rules(boolean checkfirst) if (HMS_fetch_rules(rules, sizeof rules)) { Lock_state(); - Z_Free(MSRules); - MSRules = Z_StrDup(rules); + if (MSRules) + free(MSRules); + MSRules = strdup(rules); if (MSRegistered == true) { @@ -507,7 +508,7 @@ char *GetMasterServerRules(void) char *rules; Lock_state(); - rules = MSRules ? Z_StrDup(MSRules) : NULL; + rules = MSRules ? strdup(MSRules) : NULL; Unlock_state(); return rules;