Changeset 30188

Timestamp:

Dec 27, 2010, 2:40:13 PM (15 years ago)

Author:

rhenders

Message:

dvoGetDetections() was crashing when hitting bogus detection IDs (of MAX_INT). Now skips these and reports to stderr if any have been encountered.

File:

• trunk/Ohana/src/libdvo/src/dvo_util.c (modified) (3 diffs)

trunk/Ohana/src/libdvo/src/dvo_util.c

@@ -255 +255 @@
       dvo_catalog_free (&catalog);
   }
+  size_t NInvalidDetID = 0;
   if (Ndetect) {
       dvoDetection *sorted;
@@ -262 +263 @@
       off_t i;
       for (i = 0; i < Ndetect; i++) {
-           sorted[detections[i].meas.detID] = detections[i];
+
+          if (detections[i].meas.detID < 0 || detections[i].meas.detID > (*pMaxDetID + 1))
+              NInvalidDetID++;
+          else
+              sorted[detections[i].meas.detID] = detections[i];
       }
       *results = sorted;
@@ -271 +276 @@
   FREE(detections);
 
+  if (NInvalidDetID) fprintf (stderr, "ERROR: Encountered %ld invalid detection IDs\n", NInvalidDetID);
+
   return (Ndetect);