luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

variable.c, remove memory leaks, add function to free all variables

This commit is contained in:
h_vogt 2016-07-24 18:05:48 +02:00 committed by rlar
parent 71c4b6244c
commit a52b41138f
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/frontend/variable.c
View File

@ -183,6 +183,8 @@ cp_vset(char *varname, enum cp_types type, void *value)
v->va_next = variables; v->va_next = variables;
variables = v; variables = v;
} }
else if (v_free)
free_struct_variable(v);
break; break;
case US_DONTRECORD: case US_DONTRECORD:
@ -191,6 +193,8 @@ cp_vset(char *varname, enum cp_types type, void *value)
fprintf(cp_err, "cp_vset: Internal Error: " fprintf(cp_err, "cp_vset: Internal Error: "
"%s already there, but 'dont record'\n", v->va_name); "%s already there, but 'dont record'\n", v->va_name);
} }
if (v_free)
free_struct_variable(v);
break; break;
case US_READONLY: case US_READONLY:
@ -220,30 +224,24 @@ cp_vset(char *varname, enum cp_types type, void *value)
v->va_next = ft_curckt->ci_vars; v->va_next = ft_curckt->ci_vars;
ft_curckt->ci_vars = v; ft_curckt->ci_vars = v;
} else { } else {
/* va: avoid memory leak within memcpy */
if (u->va_type == CP_STRING) if (u->va_type == CP_STRING)
tfree(u->va_string); tfree(u->va_string);
else if (u->va_type == CP_LIST) else if (u->va_type == CP_LIST)
tfree(u->va_vlist); tfree(u->va_vlist);
u->va_V = v->va_V; u->va_V = v->va_V;
/* va_name is the same string */
u->va_type = v->va_type; u->va_type = v->va_type;
/* va_name is the same string */
tfree(u->va_name);
u->va_name = v->va_name;
/* va_next left unchanged */ /* va_next left unchanged */
// tfree(v->va_name);
tfree(v); tfree(v);
/* va: old version with memory leaks
w = u->va_next;
memcpy(u, v, sizeof(*u));
u->va_next = w;
*/
} }
} }
break; break;
case US_NOSIMVAR: case US_NOSIMVAR:
/* What do you do? */ /* What do you do? */
tfree(v->va_name); free_struct_variable(v);
tfree(v);
break; break;
default: default:
@ -251,10 +249,6 @@ cp_vset(char *varname, enum cp_types type, void *value)
break; break;
} }
/* if (v_free) {
tfree(v->va_name);
tfree(v);
} */
tfree(copyvarname); tfree(copyvarname);
} }
@ -1041,3 +1035,16 @@ var_set_vlist(struct variable *v, struct variable *value)
v->va_type = CP_LIST; v->va_type = CP_LIST;
v->va_vlist = value; v->va_vlist = value;
} }
void
cp_remvar_all(void)
{
struct variable *uv1, *uv2;
cp_usrvars(&uv1, &uv2);
free_struct_variable(variables);
variables = NULL;
free_struct_variable(uv1);
free_struct_variable(uv2);
}

1
src/include/ngspice/cpextern.h
View File

@ -167,6 +167,7 @@ extern void cp_vset(char *varname, enum cp_types type, void *value);
extern struct variable *cp_setparse(wordlist *wl); extern struct variable *cp_setparse(wordlist *wl);
extern wordlist *vareval(char *string); extern wordlist *vareval(char *string);
extern char *span_var_expr(char *t); extern char *span_var_expr(char *t);
extern void cp_remvar_all(void);
/* var2.c */ /* var2.c */
extern void cp_vprint(void); extern void cp_vprint(void);