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

Prevent crash during .probe p(...) when no subcircuits are given.

This commit is contained in:
Holger Vogt 2023-03-05 11:26:00 +01:00
parent 5ee7a0ad2d
commit 8915d42241
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/frontend/inpc_probe.c
View File

@ -313,6 +313,12 @@ void inp_probe(struct card* deck)
/* to make the nodes unique */
snprintf(nodebuf, 12, "%d", i);
nodename = get_terminal_name(instname, nodebuf, instances);
if (!nodename || *nodename == '\0') {
fprintf(stderr, "Warning: Cannot find node name %d in line %s\n", i, curr_line);
fprintf(stderr, " Instance not ready for .probe command\n");
tfree(thisnode);
continue;
}
char* vline = tprintf("vcurr_%s:%s:%s_%s %s %s 0", instname, nodename, thisnode, nodebuf, thisnode, newnode);
card = insert_new_line(card, vline, 0, 0);
/* special for KiCad: add shunt resistor if thisnode contains 'unconnected' */
@ -1040,6 +1046,16 @@ static char *get_terminal_name(char* element, char *numberstr, NGHASHPTR instanc
/*Search for the corresponding .subckt line*/
struct card_assoc* allsubs = xcard->level->subckts;
if (!allsubs) {
char* instline = xcard->line;
char* inst = gettok(&instline);
fprintf(stderr, "Warning: No .subckt line found during evaluating command .probe (...)!\n");
fprintf(stderr, " failing instance: %s\n", inst);
tfree(subcktname);
tfree(inst);
return tprintf("n%s", numberstr);
}
while (allsubs) {
xcardsubsline = allsubs->line->line;
/* safeguard against NULL pointers) */