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

Applied vera patch for "show" memleak.

This commit is contained in:
pnenzi 2004-08-16 09:10:40 +00:00
parent 81f1e9a535
commit 2e4b5f71f3
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/frontend/device.c
View File

@ -19,11 +19,11 @@ Modified: 2000 AlansFixes
#include "device.h" #include "device.h"
#include "variable.h" #include "variable.h"
#include "gens.h" /* wl_forall */
static wordlist *devexpand(char *name); static wordlist *devexpand(char *name);
static void all_show(wordlist *wl, int mode); static void all_show(wordlist *wl, int mode);
/* /*
* show: list device operating point info * show: list device operating point info
* show * show
@ -38,10 +38,6 @@ static void all_show(wordlist *wl, int mode);
static int count; static int count;
extern void dgen_nth_next (dgen **dg, int n);
extern int dgen_for_n (dgen *dg, int n, int (*fn) (/* ??? */), char *data, int subindex);
extern void wl_forall (wordlist *wl, int (*fn) (/* ??? */), char *data);
void void
com_showmod(wordlist *wl) com_showmod(wordlist *wl)
{ {
@ -60,7 +56,7 @@ all_show(wordlist *wl, int mode)
wordlist *params, *nextgroup, *thisgroup; wordlist *params, *nextgroup, *thisgroup;
wordlist *prev, *next, *w; wordlist *prev, *next, *w;
int screen_width; int screen_width;
dgen *dg, *listdg = NULL; dgen *dg, *listdg;
int instances; int instances;
int i, j, n; int i, j, n;
int param_flag, dev_flag; int param_flag, dev_flag;
@ -197,7 +193,7 @@ all_show(wordlist *wl, int mode)
else if (!params) else if (!params)
param_forall(dg, DGEN_DEFPARAMS); param_forall(dg, DGEN_DEFPARAMS);
if (params) if (params)
wl_forall(params, (void *)listparam, (void *)dg); wl_forall(params, listparam, (void *)dg);
printf("\n"); printf("\n");
} else if (ft_sim->devices[dg->dev_type_no]->numModelParms) { } else if (ft_sim->devices[dg->dev_type_no]->numModelParms) {
@ -219,16 +215,11 @@ all_show(wordlist *wl, int mode)
else if (!params) else if (!params)
param_forall(dg, DGEN_DEFPARAMS); param_forall(dg, DGEN_DEFPARAMS);
if (params) if (params)
wl_forall(params, (void *) listparam, (void *)dg); wl_forall(params, listparam, (void *)dg);
printf("\n"); printf("\n");
} }
} }
/* Paolo Nenzi 2004:
* This tfree is necessary to free memory allocated by NEW in
* dgen_init. It is not possible to free dg since it is casted
* to NULL from dgen_next and is lost.
*/
tfree(listdg);
wl = nextgroup; wl = nextgroup;
} while (wl); } while (wl);
@ -661,7 +652,7 @@ com_alter_common(wordlist *wl, int do_model)
/* va: garbage collection for dv, if pnode names is no simple value */ /* va: garbage collection for dv, if pnode names is no simple value */
if (names->pn_value==NULL && dv!=NULL) vec_free(dv); if (names->pn_value==NULL && dv!=NULL) vec_free(dv);
free_pnode(names); /* free also dv, if pnode names is simple value */ free_pnode(names); /* free also dv, if pnode names is simple value */
return; return;
} }

4
src/frontend/gens.c
View File

@ -82,11 +82,15 @@ void
dgen_nth_next(dgen **dg, int n) dgen_nth_next(dgen **dg, int n)
{ {
int i, dnum; int i, dnum;
dgen * dg_old=*dg;
dnum = (*dg)->dev_type_no; dnum = (*dg)->dev_type_no;
for (i = 0; *dg && (*dg)->dev_type_no == dnum && i < n; i++) { for (i = 0; *dg && (*dg)->dev_type_no == dnum && i < n; i++) {
dgen_next(dg); dgen_next(dg);
/* va, it might be too much tests, but safer is better... */
if (*dg!=dg_old && *dg==NULL && dg_old!=NULL) tfree(dg_old);
} }
} }