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

mif_inp2.c, subckt.c: plug memory leaks at XSPICE setup

This commit is contained in:
h_vogt 2012-08-15 23:11:07 +02:00
parent 9390a9a9ec
commit b02a497490
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/subckt.c
View File

@ -999,6 +999,8 @@ translate(struct line *deck, char *formal, char *actual, char *scname, char *sub
case '%': case '%':
bxx_printf(&buffer, "%%"); bxx_printf(&buffer, "%%");
/* don't translate the port type identifier */ /* don't translate the port type identifier */
if (name)
tfree(name);
name = next_name; name = next_name;
next_name = MIFgettok(&s); next_name = MIFgettok(&s);
bxx_printf(&buffer, "%s ", name); bxx_printf(&buffer, "%s ", name);

10
src/xspice/mif/mif_inp2.c
View File

@ -280,7 +280,9 @@ card *current ) /* the card we are to parse */
Otherwise use default info */ Otherwise use default info */
if(next_token_type == MIF_PERCENT_TOK) { /* we found a % */ if(next_token_type == MIF_PERCENT_TOK) { /* we found a % */
/* get the port type identifier and check it for validity */ /* get the port type identifier and check it for validity */
next_token = MIFget_token(&line,&next_token_type); if (next_token)
tfree(next_token);
next_token = MIFget_token(&line, &next_token_type);
/* Note that MIFget_port_type eats the next token and advances the token pointer in line */ /* Note that MIFget_port_type eats the next token and advances the token pointer in line */
MIFget_port_type(ckt, MIFget_port_type(ckt,
tab, tab,
@ -387,6 +389,8 @@ card *current ) /* the card we are to parse */
return; return;
} }
else /* eat the [ */ else /* eat the [ */
if (next_token)
tfree(next_token);
next_token = MIFget_token(&line,&next_token_type); next_token = MIFget_token(&line,&next_token_type);
/*------ get and process ports until ] is encountered ------*/ /*------ get and process ports until ] is encountered ------*/
@ -446,7 +450,9 @@ card *current ) /* the card we are to parse */
We'll do that now, since when we enter the loop, we expect next_token We'll do that now, since when we enter the loop, we expect next_token
to hold the next unprocessed token. to hold the next unprocessed token.
*/ */
next_token = MIFget_token(&line,&next_token_type); if (next_token)
tfree(next_token);
next_token = MIFget_token(&line, &next_token_type);
} /* ====== array connection processing ====== */ } /* ====== array connection processing ====== */