Crash when trying to delete root and netlist:

Revert the order of deletion: Firstly the root, then the netlist.
This commit is contained in:
Holger Vogt 2021-06-21 18:26:23 +02:00
parent 858689d206
commit 31fbf910af
1 changed files with 3 additions and 1 deletions

View File

@ -887,8 +887,8 @@ struct card *inp_readall(FILE *fp, const char *dir_name,
inp_add_control_section(working, &rv.line_number); inp_add_control_section(working, &rv.line_number);
#ifdef XSPICE #ifdef XSPICE
if (inp_poly_2g6_compat(working)) { if (inp_poly_2g6_compat(working)) {
line_free_x(cc, TRUE);
inp_rem_levels(root); inp_rem_levels(root);
line_free_x(cc, TRUE);
return NULL; return NULL;
} }
#else #else
@ -9671,6 +9671,8 @@ static int inp_poly_2g6_compat(struct card* deck) {
curr_line = nexttok_noparens(curr_line); curr_line = nexttok_noparens(curr_line);
curr_line = nexttok_noparens(curr_line); curr_line = nexttok_noparens(curr_line);
curr_line = nexttok_noparens(curr_line); curr_line = nexttok_noparens(curr_line);
if (!curr_line)
return 1;
/* exclude all of the following fourth tokens */ /* exclude all of the following fourth tokens */
if (ciprefix("poly", curr_line)) if (ciprefix("poly", curr_line))
continue; continue;