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

bug report 3008000

This commit is contained in:
h_vogt 2010-06-04 20:16:43 +00:00
parent ba48d85de1
commit 0c3cbd5410
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2010-06-04 Holger Vogt
* inpcom.c: bug report 3008000, overflow of fixed array of
used_subckt_names, used_model_names in fcn comment_out_unused_subckt_models
removed by dynamic memory allocation
2010-06-03 Holger Vogt
* src\spicelib\devices\bsim3soi
b4soi.c b4soiacld.c b4soiask.c b4soicheck.c b4soicvtest.c

12
src/frontend/inpcom.c
View File

@ -726,13 +726,17 @@ model_bin_match( char* token, char* model_name )
also comment out .param lines with no parameters defined
*/
static void
comment_out_unused_subckt_models( struct line *start_card )
comment_out_unused_subckt_models( struct line *start_card , int no_of_lines)
{
struct line *card;
char *used_subckt_names[1000], *used_model_names[1000], *line = NULL, *subckt_name, *model_name;
char **used_subckt_names, **used_model_names, *line = NULL, *subckt_name, *model_name;
int num_used_subckt_names = 0, num_used_model_names = 0, i = 0, num_terminals = 0, tmp_cnt = 0;
bool processing_subckt = FALSE, found_subckt = FALSE, remove_subckt = FALSE, found_model = FALSE, has_models = FALSE;
/* generate arrays of *char for subckt or model names */
used_subckt_names = (char**)tmalloc(no_of_lines);
used_model_names = (char**)tmalloc(no_of_lines);
for ( card = start_card; card != NULL; card = card->li_next ) {
if ( ciprefix( ".model", card->li_line ) ) has_models = TRUE;
if ( ciprefix( ".cmodel", card->li_line ) ) has_models = TRUE;
@ -833,6 +837,8 @@ comment_out_unused_subckt_models( struct line *start_card )
}
for ( i = 0; i < num_used_subckt_names; i++ ) tfree(used_subckt_names[i]);
for ( i = 0; i < num_used_model_names; i++ ) tfree(used_model_names[i]);
tfree(used_subckt_names);
tfree(used_model_names);
}
@ -1537,7 +1543,7 @@ inp_readall(FILE *fp, struct line **data, int call_depth, char *dir_name)
inp_remove_excess_ws(working);
if ( call_depth == 0 ) {
comment_out_unused_subckt_models(working);
comment_out_unused_subckt_models(working, line_number);
line_number = inp_split_multi_param_lines(working, line_number);