Changeset 33202

Timestamp:

Feb 3, 2012, 9:52:16 AM (14 years ago)

Author:

eugene

Message:

put in validity checks for db consistency

File:

• branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/mextract.c (modified) (1 diff)

branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/mextract.c

@@ -139 +139 @@
     for (j = 0; (j < catalog.Naverage) && !interrupt; j++) {
       m = catalog.average[j].measureOffset;
+      if (m > catalog.Nmeasure) {
+        gprint (GP_ERR, "ERROR: inconsistent average->measure offset.  Unsorted database?\n");
+        goto escape;
+      }
+
       dbExtractMeasuresInitAve (); // reset counters for saved fields 
 
       for (k = 0; (k < catalog.average[j].Nmeasure); k++, m++) {
+        if (catalog.measure[m].averef != j) {
+          gprint (GP_ERR, "ERROR: inconsistent measure->average link.  Unsorted database?\n");
+          goto escape;
+        }
 
         // extract the relevant values for this measurement