Changeset 34220

Timestamp:

Jul 30, 2012, 5:03:34 PM (14 years ago)

Author:

watersc1

Message:

Edit to ensure that the boxid array is initialized to -1, and that any values still with -1 are skipped in the union case. I'm not totally sure this is the best solution, but it will at least prevent segfaults.

File:

• trunk/extsrc/gpcsw/gpcsrc/fits/burntool/persistio.c (modified) (2 diffs)

trunk/extsrc/gpcsw/gpcsrc/fits/burntool/persistio.c

@@ -132 +132 @@
 /* Assess the clustering of all the streaks */
    for(i=0; i<MAXSIZE; i++) xusage[i] = 0;
+   for(i=0; i<MAXSIZE; i++) boxid[i] = -1;
    for(k=0; k<nbox; k++) {
       if(box[k].exfit >= MAXSIZE-1) continue;
@@ -188 +189 @@
          for(jp=kp+1; jp<n; jp++) {
             j = boxid[jp];
+            /* CZW: Since I added the initialization statement above, */
+            /*      any box with boxid == -1 hasn't been set, and */
+            /*      therefore needs to be dropped, I think. */
+            if ((k < 0)||(j < 0)) { continue; }
             if(ABS(yctr[jp]-yctr[kp]) <= DIFFERENT_STREAK) {
 /* Merge k into j, trash k from further consideration */