From 61cf92928e1e013434bc190bf70bcd53c99abc95 Mon Sep 17 00:00:00 2001 From: divverent Date: Wed, 4 Mar 2015 14:59:32 +0000 Subject: [PATCH] Fix memory corruption in loadconfig while in game/menu. Autocvars are engine strings to QC, so we can't just let them die. Instead, reset them to default, which is what the progs would expect anyway. git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12182 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=b0ad0294366f5d21928cee69b98a43f4aa12962b --- cvar.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/cvar.c b/cvar.c index e92e0dfa..5ae8e521 100644 --- a/cvar.c +++ b/cvar.c @@ -262,6 +262,20 @@ void Cvar_CompleteCvarPrint (const char *partial) Con_Printf ("^3%s^7 is \"%s\" [\"%s\"] %s\n", cvar->name, cvar->string, cvar->defstring, cvar->description); } +// check if a cvar is held by some progs +static qboolean Cvar_IsAutoCvar(cvar_t *var) +{ + int i; + prvm_prog_t *prog; + for (i = 0;i < PRVM_PROG_MAX;i++) + { + prog = &prvm_prog_list[i]; + if (prog->loaded && var->globaldefindex_progid[i] == prog->id) + return true; + } + return false; +} + // we assume that prog is already set to the target progs static void Cvar_UpdateAutoCvar(cvar_t *var) { @@ -751,6 +765,18 @@ void Cvar_RestoreInitState(void) if (!(c->flags & CVAR_ALLOCATED)) { Con_DPrintf("Cvar_RestoreInitState: Unable to destroy cvar \"%s\", it was registered after init!\n", c->name); + // In this case, at least reset it to the default. + if((c->flags & CVAR_NORESETTODEFAULTS) == 0) + Cvar_SetQuick(c, c->defstring); + cp = &c->next; + continue; + } + if (Cvar_IsAutoCvar(c)) + { + Con_DPrintf("Cvar_RestoreInitState: Unable to destroy cvar \"%s\", it is an autocvar used by running progs!\n", c->name); + // In this case, at least reset it to the default. + if((c->flags & CVAR_NORESETTODEFAULTS) == 0) + Cvar_SetQuick(c, c->defstring); cp = &c->next; continue; } -- 2.39.2