qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-05-31 08:41:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[cvar] Plug a pile of memory leaks

Browse source 
Mostly in user cvars, but also any string vars.
This commit is contained in:
Bill Currie 2022-05-12 19:08:40 +09:00
parent 8db8f91e7d
commit edf5c66321
1 changed files with 45 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

51
libs/util/cvar.c
View file

@ -124,16 +124,17 @@ cvar_destroy (cvar_t *var)
if (!(var->flags & CVAR_USER_CREATED)) { if (!(var->flags & CVAR_USER_CREATED)) {
Sys_Error ("Attempt to destroy non-user cvar"); Sys_Error ("Attempt to destroy non-user cvar");
} }
Hash_Del (user_cvar_hash, var->name); Hash_Free (user_cvar_hash, Hash_Del (user_cvar_hash, var->name));
free (*(char **) var->value.value);
free ((char *) var->name);
free (var);
} }
VISIBLE cvar_t * VISIBLE cvar_t *
Cvar_FindVar (const char *var_name) Cvar_FindVar (const char *var_name)
{ {
return (cvar_t*) Hash_Find (cvar_hash, var_name); cvar_t *var = Hash_Find (cvar_hash, var_name);
if (!var) {
var = Hash_Find (user_cvar_hash, var_name);
}
return var;
} }
VISIBLE cvar_t * VISIBLE cvar_t *
@ -762,6 +763,31 @@ Cvar_CvarList_f (void)
Sys_Printf ("------------\n%d variables\n", num_vars); Sys_Printf ("------------\n%d variables\n", num_vars);
} }
static void
cvar_free_memory (void *ele, void *data)
{
const cvar_t *cvar = ele;
if (!cvar->value.type) {
char **str_value = cvar->value.value;
free (*str_value);
*str_value = 0;
}
if (cvar->listeners) {
DARRAY_CLEAR (cvar->listeners);
free (cvar->listeners);
}
}
static void
cvar_shutdown (void *data)
{
Hash_ForEach (cvar_hash, cvar_free_memory, 0);
Hash_DelTable (cvar_hash);
Hash_DelTable (user_cvar_hash);
Hash_DelTable (calias_hash);
}
static const char * static const char *
cvar_get_key (const void *c, void *unused) cvar_get_key (const void *c, void *unused)
{ {
@ -769,6 +795,16 @@ cvar_get_key (const void *c, void *unused)
return cvar->name; return cvar->name;
} }
static void
cvar_free (void *c, void *unused)
{
cvar_t *cvar = (cvar_t*)c;
free (*(char **) cvar->value.value);
free ((char *) cvar->name);
free (cvar);
}
static void static void
calias_free (void *c, void *unused) calias_free (void *c, void *unused)
{ {
@ -788,8 +824,11 @@ VISIBLE void
Cvar_Init_Hash (void) Cvar_Init_Hash (void)
{ {
cvar_hash = Hash_NewTable (1021, cvar_get_key, 0, 0, 0); cvar_hash = Hash_NewTable (1021, cvar_get_key, 0, 0, 0);
user_cvar_hash = Hash_NewTable (1021, cvar_get_key, 0, 0, 0); user_cvar_hash = Hash_NewTable (1021, cvar_get_key, cvar_free, 0, 0);
calias_hash = Hash_NewTable (1021, calias_get_key, calias_free, 0, 0); calias_hash = Hash_NewTable (1021, calias_get_key, calias_free, 0, 0);
Sys_RegisterShutdown (cvar_shutdown, 0);
} }
VISIBLE void VISIBLE void