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, when vector is defined, but still empty.

This commit is contained in:
Holger Vogt 2023-11-18 17:17:04 +01:00
parent e376c0e5c6
commit 4d4f226a83
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/frontend/com_measure2.c
View File

@ -400,6 +400,11 @@ com_measure_when(
return MEASUREMENT_FAILURE;
}
if (dScale->v_realdata ==NULL && dScale->v_compdata == NULL) {
fprintf(cp_err, "Error: scale vector time, frequency or dc has no data.\n");
return MEASUREMENT_FAILURE;
}
prevValue = 0.;
prevValue2 = 0.;
prevScaleValue = 0.;
@ -658,6 +663,11 @@ measure_at(
return MEASUREMENT_FAILURE;
}
if (dScale->v_realdata == NULL && dScale->v_compdata == NULL) {
fprintf(cp_err, "Error: scale vector time, frequency or dc has no data.\n");
return MEASUREMENT_FAILURE;
}
/* -----------------------------------------------------------------
* Take the string tests outside of the loop for speed.
* ----------------------------------------------------------------- */
@ -768,7 +778,12 @@ measure_minMaxAvg(
}
if (dScale == NULL) {
fprintf(cp_err, "Error: no such vector as time, frquency or v-sweep.\n");
fprintf(cp_err, "Error: no such vector as time, frequency or v-sweep.\n");
return MEASUREMENT_FAILURE;
}
if (dScale->v_realdata == NULL && dScale->v_compdata == NULL) {
fprintf(cp_err, "Error: scale vector time, frequency or v-sweep has no data.\n");
return MEASUREMENT_FAILURE;
}
@ -944,7 +959,12 @@ measure_rms_integral(
}
if (xScale == NULL) {
fprintf(cp_err, "Error: no such vector as time.\n");
fprintf(cp_err, "Error: no such vector as time, frequency or v-sweep.\n");
return MEASUREMENT_FAILURE;
}
if (xScale->v_realdata == NULL && xScale->v_compdata == NULL) {
fprintf(cp_err, "Error: scale vector time, frequency or v-sweep has no data.\n");
return MEASUREMENT_FAILURE;
}