Browse Source

Prevent crash, when vector is defined, but still empty.

pre-master-46
Holger Vogt 2 years ago
parent
commit
4d4f226a83
  1. 24
      src/frontend/com_measure2.c

24
src/frontend/com_measure2.c

@ -400,6 +400,11 @@ com_measure_when(
return MEASUREMENT_FAILURE; 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.; prevValue = 0.;
prevValue2 = 0.; prevValue2 = 0.;
prevScaleValue = 0.; prevScaleValue = 0.;
@ -658,6 +663,11 @@ measure_at(
return MEASUREMENT_FAILURE; 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. * Take the string tests outside of the loop for speed.
* ----------------------------------------------------------------- */ * ----------------------------------------------------------------- */
@ -768,7 +778,12 @@ measure_minMaxAvg(
} }
if (dScale == NULL) { 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; return MEASUREMENT_FAILURE;
} }
@ -944,7 +959,12 @@ measure_rms_integral(
} }
if (xScale == NULL) { 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; return MEASUREMENT_FAILURE;
} }

Loading…
Cancel
Save