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

meas ac: remove seg fault

This commit is contained in:
h_vogt 2010-09-15 21:54:46 +00:00
parent d936068864
commit 590bf0a677
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2010-09-15 Holger Vogt
* com_measure2.c: prevent seg fault in meas ac, if real input
2010-09-12 Robert Larice
* src/main.c :
fix incorrect buffer type, and exit(1) on failure to open a tempfile

23
src/frontend/com_measure2.c
View File

@ -421,7 +421,10 @@ static void com_measure_when(
// timeValue = dTime->v_realdata[i];
if (ac_check) {
value = get_value(meas, d, i); //d->v_compdata[i].cx_real;
if (d->v_compdata)
value = get_value(meas, d, i); //d->v_compdata[i].cx_real;
else
value = d->v_realdata[i];
timeValue = dTime->v_compdata[i].cx_real;
}
else if (sp_check) {
@ -653,8 +656,8 @@ static void measure_minMaxAvg(
if (d->v_compdata)
value = get_value(meas, d, i); //d->v_compdata[i].cx_real;
else {
fprintf(cp_err, "Error: 'meas ac' requires complex input vector!\n");
return;
value = d->v_realdata[i];
fprintf(cp_err, "Warning: 'meas ac' input vector is real!\n");
}
svalue = dScale->v_compdata[i].cx_real;
}
@ -791,7 +794,12 @@ static void measure_rms_integral(
/* create new set of values over interval [from, to] -- interpolate if necessary */
for (i=0; i < d->v_length; i++) {
if (cieq (meas->m_analysis,"ac")) {
value = get_value(meas, d, i); //d->v_compdata[i].cx_real;
if (d->v_compdata)
value = get_value(meas, d, i); //d->v_compdata[i].cx_real;
else {
value = d->v_realdata[i];
fprintf(cp_err, "Warning: 'meas ac' input vector is real!\n");
}
xvalue = xScale->v_compdata[i].cx_real;
}
else {
@ -865,7 +873,12 @@ static void measure_rms_integral(
/* Now set the measurement values if not set */
if( toVal < 0.0 ){
if (cieq (meas->m_analysis,"ac")) {
value = get_value(meas, d, i); //d->v_compdata[i].cx_real;
if (d->v_compdata)
value = get_value(meas, d, i); //d->v_compdata[i].cx_real;
else {
value = d->v_realdata[i];
fprintf(cp_err, "Warning: 'meas ac' input vector is real!\n");
}
xvalue = xScale->v_compdata[i].cx_real;
toVal = xScale->v_compdata[d->v_length-1].cx_real;
}