Changeset 43024

Timestamp:

May 19, 2026, 5:03:35 PM (2 months ago)

Author:

eugene

Message:

free analysis and bias elements of pmReadout in FreeData, but reallocated if structure is reused

Location:

branches/eam_branches/ipp-pstamp-20260421/psModules/src/camera

Files:

• pmFPA.c (modified) (2 diffs)
• pmFPARead.c (modified) (2 diffs)

branches/eam_branches/ipp-pstamp-20260421/psModules/src/camera/pmFPA.c

@@ -166 +166 @@
     psFree(readout->variance);
     psFree(readout->covariance);
-    psFree(readout->analysis);
+//  psFree(readout->analysis);
+//  EAM XXX : if we free this here, ppSub fails to find the subtraction kernel.
+//  surprisingly, this does not cause leaks in ppSub, ppStack or ppImage
     psFree(readout->bias);
 
@@ -174 +176 @@
     readout->variance = NULL;
     readout->covariance = NULL;
-    readout->analysis = NULL;
+//  readout->analysis = NULL; EAM see above
     readout->mask = NULL;
     readout->bias = NULL;
+//  readout->bias = psListAlloc(NULL); -- works with this in place
+//  if we allocate the bias list here, we introduce a leak
 
     readout->col0 = 0;

branches/eam_branches/ipp-pstamp-20260421/psModules/src/camera/pmFPARead.c

@@ -456 +456 @@
     // Get the list of overscans: only for IMAGE types (no overscan for MASK and VARIANCE)
     if (type == FPA_READ_TYPE_IMAGE) {
+        // prevent the segfault by testing for readout->bias to exist
+        if (!readout->bias) {
+            readout->bias = psListAlloc(NULL);
+        }
+        // why would we have a left-over entry on the bias array?
         if (readout->bias->n != 0) {
             // Make way!
@@ -846 +851 @@
         }
 
+        // XXX EAM: sometimes we arrive here with the array of readouts full
+        // but missing critical pieces??
         pmReadout *readout;             // Readout into which to read
         if (cell->readouts->n > i && cell->readouts->data[i]) {
             readout = psMemIncrRefCounter(cell->readouts->data[i]);
+            // if we get to this point with a reused readout,
+            // the analysis and bias entries will be NULL
+            if (!readout->analysis) {
+                readout->analysis = psMetadataAlloc();
+            }
+            if (!readout->bias) {
+                readout->bias = psListAlloc(NULL);
+            }
         } else {
             readout = pmReadoutAlloc(cell);