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

memory leaks removed

This commit is contained in:
h_vogt 2009-03-28 20:06:38 +00:00
parent 624a8a0be0
commit e3fc225e50
4 changed files with 82 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2009-03-27 Holger Vogt
* inpcom.c, variable.c, cpitf.c: memory leaks removed, which were detected by
valgrind-3.4.1 under SUSE 11.1
2009-03-22 Holger Vogt
* inpcom.c: readline() now returns /n for an empty line, dynLlen consists of
maximum line length plus some space for parameter substitution and has a

4
src/frontend/cpitf.c
View File

@ -208,10 +208,10 @@ ft_cpinit(void)
if (Lib_Path && *Lib_Path) {
(void) sprintf(buf, "sourcepath = ( %s %s )", DIR_CWD, Lib_Path);
wl = cp_doglob(cp_lexer(buf));
wl = cp_doglob(cp_lexer(buf));
cp_striplist(wl);
com_set(wl);
wl_free(wl);
/* Now source the standard startup file. */
/* XXX strange */

94
src/frontend/inpcom.c
View File

@ -159,9 +159,10 @@ readline(FILE *fd)
tfree(strptr);
return (NULL);
}
strptr[strlen] = '\0';
// strptr[strlen] = '\0';
/* Trim the string */
strptr = trealloc(strptr, strlen + 1);
strptr[strlen] = '\0';
return (strptr);
}
@ -803,6 +804,7 @@ comment_out_unused_subckt_models( struct line *start_card )
for ( i = 0; i < num_used_model_names; i++ )
if ( strcmp( used_model_names[i], model_name ) == 0 || model_bin_match( used_model_names[i], model_name ) ) found_model = TRUE;
if ( !found_model ) *line = '*';
tfree(model_name);
}
}
for ( i = 0; i < num_used_subckt_names; i++ ) tfree(used_subckt_names[i]);
@ -1065,7 +1067,7 @@ inp_readall(FILE *fp, struct line **data, int call_depth, char *dir_name)
/* gtri - end - 12/12/90 */
#else
while ((buffer = readline(fp))) {
while ((buffer = readline(fp))) {
#endif
#ifdef TRACE
@ -1081,6 +1083,7 @@ inp_readall(FILE *fp, struct line **data, int call_depth, char *dir_name)
if ( (strcmp(buffer,"\n") == 0) || (strcmp(buffer,"\r\n") == 0) ) {
if ( call_depth != 0 || (call_depth == 0 && cc != NULL) ) {
line_number_orig++;
tfree(buffer); /* was allocated by readline() */
continue;
}
}
@ -1308,9 +1311,10 @@ inp_readall(FILE *fp, struct line **data, int call_depth, char *dir_name)
end->li_next = NULL;
end->li_error = NULL;
end->li_actual = NULL;
end->li_line = buffer;
end->li_line = copy(buffer);
end->li_linenum = line_number++;
end->li_linenum_orig = line_number_orig++;
tfree(buffer);
} /* end while ((buffer = readline(fp))) */
if (!end) { /* No stuff here */
@ -1318,9 +1322,6 @@ inp_readall(FILE *fp, struct line **data, int call_depth, char *dir_name)
return;
}
/* This should be freed because we are done with it. */
/* tfree(buffer); */
if ( call_depth == 0 && found_end == TRUE) {
if ( global == NULL ) {
global = tmalloc( strlen(".global gnd") + 1 );
@ -1519,8 +1520,8 @@ inp_readall(FILE *fp, struct line **data, int call_depth, char *dir_name)
inp_expand_macros_in_deck(working);
inp_fix_param_values(working);
// get end card as last card in list; end card pntr does not appear to always
// be correct at this point
/* get end card as last card in list; end card pntr does not appear to always
be correct at this point */
for(newcard = working; newcard != NULL; newcard = newcard->li_next)
end = newcard;
@ -1788,45 +1789,47 @@ inp_fix_subckt( char *s )
static char*
inp_remove_ws( char *s )
{
char *big_buff = tmalloc( strlen(s) + 1 );
int big_buff_index = 0;
char *buffer, *curr;
bool is_expression = FALSE;
curr = s;
while ( *curr != '\0' ) {
if ( *curr == '{' ) is_expression = TRUE;
if ( *curr == '}' ) is_expression = FALSE;
big_buff[big_buff_index++] = *curr;
if ( *curr == '=' || (is_expression && (is_arith_char(*curr) || *curr == ',')) ) {
curr++;
while ( isspace(*curr) ) curr++;
char *big_buff;
int big_buff_index = 0;
char *buffer, *curr;
bool is_expression = FALSE;
big_buff = tmalloc( strlen(s) + 1 );
curr = s;
while ( *curr != '\0' ) {
if ( *curr == '{' ) is_expression = TRUE;
if ( *curr == '}' ) is_expression = FALSE;
big_buff[big_buff_index++] = *curr;
}
curr++;
if ( isspace(*curr) ) {
while ( isspace(*curr) ) curr++;
if ( is_expression ) {
if ( *curr != '=' && !is_arith_char(*curr) && *curr != ',' ) big_buff[big_buff_index++] = ' ';
} else {
if ( *curr != '=' ) big_buff[big_buff_index++] = ' ';
if ( *curr == '=' || (is_expression && (is_arith_char(*curr) || *curr == ',')) ) {
curr++;
while ( isspace(*curr) ) curr++;
if ( *curr == '{' ) is_expression = TRUE;
if ( *curr == '}' ) is_expression = FALSE;
big_buff[big_buff_index++] = *curr;
}
}
}
big_buff[big_buff_index++] = *curr;
curr++;
if ( isspace(*curr) ) {
while ( isspace(*curr) ) curr++;
if ( is_expression ) {
if ( *curr != '=' && !is_arith_char(*curr) && *curr != ',' ) big_buff[big_buff_index++] = ' ';
} else {
if ( *curr != '=' ) big_buff[big_buff_index++] = ' ';
}
}
}
// big_buff[big_buff_index++] = *curr;
big_buff[big_buff_index] = '\0';
buffer = tmalloc( strlen(big_buff) + 1 );
sprintf( buffer, "%s", big_buff );
buffer = copy(big_buff);
tfree(s);
tfree(big_buff);
tfree(s);
tfree(big_buff);
return buffer;
return buffer;
}
static void
@ -1866,7 +1869,7 @@ inp_remove_excess_ws(struct line *deck )
struct line *c = deck;
while ( c != NULL ) {
if ( *c->li_line == '*' ) { c = c->li_next; continue; }
c->li_line = inp_remove_ws(c->li_line);
c->li_line = inp_remove_ws(c->li_line); /* freed in fcn */
c = c->li_next;
}
}
@ -2185,14 +2188,16 @@ inp_fix_inst_calls_for_numparam(struct line *deck)
}
d = d->li_next;
}
if ( flag ) {
if ( flag ) {
num_subckt_params = inp_get_params( p->li_line, subckt_param_names, subckt_param_values );
if ( num_subckt_params == 0 || !found_mult_param( num_subckt_params, subckt_param_names ) ) {
inp_fix_subckt_multiplier( p, num_subckt_params, subckt_param_names, subckt_param_values );
}
}
}
}
tfree(subckt_name );
}
}
@ -2254,6 +2259,7 @@ inp_fix_inst_calls_for_numparam(struct line *deck)
break;
}
}
tfree(subckt_name);
}
c = c->li_next;
}
@ -2868,7 +2874,9 @@ get_number_terminals( char *c )
i = 0;
/* find the first token with "off" or "=" in the line*/
while ( (i < 20) && (*c != '\0') ) {
strncpy(nam_buf, gettok_instance(&c), 32);
char *inst = gettok_instance(&c);
strncpy(nam_buf, inst, 32);
txfree(inst);
if (strstr(nam_buf, "off") || strstr(nam_buf, "=")) break;
i++;
}
@ -2973,7 +2981,7 @@ inp_sort_params( struct line *start_card, struct line *end_card, struct line *ca
if ( strstr( ptr->li_line, "=" ) ) {
depends_on[num_params][0] = NULL;
level[num_params] = -1;
param_names[num_params] = strdup( get_param_name( ptr->li_line ) );
param_names[num_params] = get_param_name( ptr->li_line ); /* strdup in fcn */
param_strs[num_params] = strdup( get_param_str( ptr->li_line ) );
ptr_array[num_params++] = ptr;

25
src/frontend/variable.c
View File

@ -508,6 +508,23 @@ cp_remvar(char *varname)
}
/* free the struct variable. The type of the union is given by va_type */
void
free_struct_variable(struct variable *v)
{
struct variable *tv, *tvv;
if(!v) return;
tv = v;
while(tv) {
tvv = tv->va_next;
if(tv->va_type == VT_LIST) free_struct_variable(tv->va_vlist);
if(tv->va_type == VT_STRING) tfree(tv->va_string);
tfree(tv);
tv = tvv;
}
}
/* Determine the value of a variable. Fail if the variable is unset,
* and if the type doesn't match, try and make it work... */
bool
@ -530,6 +547,7 @@ cp_getvar(char *name, int type, void *retval)
if (v == NULL) {
if (type == VT_BOOL)
* (bool *) retval = FALSE;
free_struct_variable(uv1);
return (FALSE);
}
if (v->va_type == type) {
@ -569,6 +587,8 @@ cp_getvar(char *name, int type, void *retval)
type);
break;
}
free_struct_variable(uv1);
// tfree(uv2);
return (TRUE);
} else {
/* Try to coerce it.. */
@ -576,19 +596,24 @@ cp_getvar(char *name, int type, void *retval)
int *i;
i = (int *) retval;
*i = (int) v->va_real;
free_struct_variable(uv1);
return (TRUE);
} else if ((type == VT_REAL) && (v->va_type == VT_NUM)) {
double *d;
d = (double *) retval;
*d = (double) v->va_num;
free_struct_variable(uv1);
return (TRUE);
} else if ((type == VT_STRING) && (v->va_type == VT_NUM)) {
(void) sprintf(retval, "%d", v->va_num);
free_struct_variable(uv1);
return (TRUE);
} else if ((type == VT_STRING) && (v->va_type == VT_REAL)) {
(void) sprintf(retval, "%f", v->va_real);
free_struct_variable(uv1);
return (TRUE);
}
free_struct_variable(uv1);
return (FALSE);
}
}