Changeset 37762

Timestamp:

Dec 18, 2014, 5:50:22 PM (12 years ago)

Author:

eugene

Message:

lensingOffset may have an invalid value if Nlensing is 0

File:

• trunk/Ohana/src/dvomerge/src/build_links.c (modified) (2 diffs)

trunk/Ohana/src/dvomerge/src/build_links.c

@@ -241 +241 @@
   for (i = 0; i < Naverage; i++) {
     if (!average[i].Nlensing) continue;
+    off_t m = average[i].lensingOffset;
+    myAssert (lensing[m].averef == i, "not sorted");
     for (j = 0; j < average[i].Nlensing - 1; j++, N++) {
+      myAssert (lensing[m+j+1].averef == i, "not sorted");
       next_lens[N] = N + 1;
       if (N >= Nlensing) {
@@ -329 +332 @@
   }
 
-  if (m == -1) {
+  // if Nlensing is 0, m may have been mis-set; add to the end
+  if ((average[0].Nlensing == 0) || (m == -1)) {
     average[0].lensingOffset = Nlensing;
   } else {