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

* dotcards.c: Added assertions to guard a double indirection, now 

ngspice will bomb out on an assertion instead of a segfault.
This commit is contained in:
arno 2000-09-09 12:12:32 +00:00
parent 394c92c2a6
commit 7a3a17a5b9
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/frontend/ChangeLog
View File

@ -1,3 +1,8 @@
2000-09-09 Arno W. Peters <A.W.Peters@ieee.org>
* dotcards.c: Added assertions to guard a double indirection, now
ngspice will bomb out on an assertion instead of a segfault.
2000-07-18 Arno W. Peters <A.W.Peters@ieee.org> 2000-07-18 Arno W. Peters <A.W.Peters@ieee.org>
* com_ahelp.c, com_help.c, com_plot.c, com_set.c, com_unset.c: * com_ahelp.c, com_help.c, com_plot.c, com_set.c, com_unset.c:

23
src/frontend/dotcards.c
View File

@ -7,8 +7,10 @@ Modified: 2000 AlansFixes
/* /*
* Spice-2 compatibility stuff for .plot, .print, .four, and .width. * Spice-2 compatibility stuff for .plot, .print, .four, and .width.
*/ */
#include <config.h>
#include <ngspice.h>
#include <assert.h>
#include "ngspice.h"
#include "cpdefs.h" #include "cpdefs.h"
#include "ftedefs.h" #include "ftedefs.h"
#include "dvec.h" #include "dvec.h"
@ -162,7 +164,7 @@ ft_cktcoms(bool terse)
/* Listing */ /* Listing */
if (ft_listprint) { if (ft_listprint) {
if (FALSE) if (terse)
fprintf(cp_err, ".options: no listing, rawfile was generated.\n"); fprintf(cp_err, ".options: no listing, rawfile was generated.\n");
else else
inp_list(cp_out, ft_curckt->ci_deck, ft_curckt->ci_options, inp_list(cp_out, ft_curckt->ci_deck, ft_curckt->ci_options,
@ -170,8 +172,10 @@ ft_cktcoms(bool terse)
} }
/* If there was a .op line, then we have to do the .op output. */ /* If there was a .op line, then we have to do the .op output. */
assert(plot_cur != NULL);
assert(plot_cur->pl_dvecs != NULL);
if (setcplot("op") && (plot_cur->pl_dvecs->v_realdata!=NULL)) { if (setcplot("op") && (plot_cur->pl_dvecs->v_realdata!=NULL)) {
if (FALSE) { if (terse) {
fprintf(cp_out, "OP information in rawfile.\n"); fprintf(cp_out, "OP information in rawfile.\n");
} else { } else {
fprintf(cp_out, "\t%-30s%15s\n", "Node", "Voltage"); fprintf(cp_out, "\t%-30s%15s\n", "Node", "Voltage");
@ -237,7 +241,7 @@ ft_cktcoms(bool terse)
} else if (eq(command->wl_word, ".print")) { } else if (eq(command->wl_word, ".print")) {
if (terse) { if (terse) {
fprintf(cp_out, fprintf(cp_out,
".print line ignored since rawfile was produced.\n"); ".print line ignored since rawfile was produced.\n");
} else { } else {
command = command->wl_next; command = command->wl_next;
if (!command) { if (!command) {
@ -265,7 +269,7 @@ ft_cktcoms(bool terse)
} else if (eq(command->wl_word, ".plot")) { } else if (eq(command->wl_word, ".plot")) {
if (terse) { if (terse) {
fprintf(cp_out, fprintf(cp_out,
".plot line ignored since rawfile was produced.\n"); ".plot line ignored since rawfile was produced.\n");
} else { } else {
command = command->wl_next; command = command->wl_next;
if (!command) { if (!command) {
@ -288,12 +292,12 @@ ft_cktcoms(bool terse)
} }
if (!found) if (!found)
fprintf(cp_err, "Error: .plot: no %s analysis found.\n", fprintf(cp_err, "Error: .plot: no %s analysis found.\n",
plottype); plottype);
} }
} else if (ciprefix(".four", command->wl_word)) { } else if (ciprefix(".four", command->wl_word)) {
if (terse) { if (terse) {
fprintf(cp_out, fprintf(cp_out,
".fourier line ignored since rawfile was produced.\n"); ".fourier line ignored since rawfile was produced.\n");
} else if (setcplot("tran")) { } else if (setcplot("tran")) {
com_fourier(command->wl_next); com_fourier(command->wl_next);
fprintf(cp_out, "\n\n"); fprintf(cp_out, "\n\n");
@ -328,10 +332,11 @@ nocmds:
} else } else
com_rusage((wordlist *) NULL); com_rusage((wordlist *) NULL);
(void) putc('\n', cp_out); putc('\n', cp_out);
return 0; return 0;
bad: fprintf(cp_err, "Internal Error: ft_cktcoms: bad commands\n"); bad:
fprintf(cp_err, "Internal Error: ft_cktcoms: bad commands\n");
return 1; return 1;
} }