Changeset 41912

Timestamp:

Nov 10, 2021, 3:50:26 PM (5 years ago)

Author:

eugene

Message:

plug leaks

Location:

tags/ipp-ps1-20211104/psModules/src/objects

Files:

• pmSourceIO.h (modified) (1 diff)
• pmSourceIO_CMF.c.in (modified) (1 diff)
• pmSourceIO_Ghosts.c (modified) (5 diffs)
• pmSourceInternal.h (modified) (1 diff)

tags/ipp-ps1-20211104/psModules/src/objects/pmSourceIO.h

@@ -95 +95 @@
 bool pmSourceIO_WriteGhosts (psFits *fits, pmFPA *fpa, pmConfig *config);
 
+void              pmSourceChipBoundsCleanup (void);
+
 /// @}
 # endif /* PM_SOURCE_IO_H */

tags/ipp-ps1-20211104/psModules/src/objects/pmSourceIO_CMF.c.in

@@ -485 +485 @@
     if (!psFitsWriteTableNew(fits, header, table, extname)) {
         psError(psErrorCodeLast(), false, "writing ext data %s\n", extname);
+        psFree(tableColumns);
         psFree(table);
         psFree(header);
         return false;
     }
+    psFree(tableColumns);
     psFree(table);
     psFree(header);

tags/ipp-ps1-20211104/psModules/src/objects/pmSourceIO_Ghosts.c

@@ -57 +57 @@
 
 # include "pmSourceInternal.h"
-static psVector *chipXmin = NULL;
-static psVector *chipXmax = NULL;
-static psVector *chipYmin = NULL;
-static psVector *chipYmax = NULL;
 
 # define ESCAPE(MSG) { \
@@ -243 +239 @@
 
                         //do a rudimentary check of whether the ghost is on the pixel FPA
-                        if (abs(ghost->FP->y) > 21000.)  continue;
-                        if (abs(ghost->FP->x) > 21000.)  continue;
+                        if (abs(ghost->FP->y) > 21000.)  { psFree (ghost); continue; }
+                        if (abs(ghost->FP->x) > 21000.)  { psFree (ghost); continue; }
 
                         //save the ghost positions
@@ -267 +263 @@
                             psArrayAdd (table, 100, row);
                             psFree (row);
-                                                
-                        }
-                        else {
+                        } else {
                             psMetadata *row = psMetadataAlloc ();
                             psMetadataAdd (row, PS_LIST_TAIL, "X_STAR_FPA",     PS_DATA_F32,    "x coord on focal plane",         ref->FP->x);
@@ -290 +284 @@
                             psFree (row);
                         }                 
-                                                
+                        psFree (ghost);
                     }
                 }
@@ -366 +360 @@
 }
 
+static psVector *chipXmin = NULL;
+static psVector *chipXmax = NULL;
+static psVector *chipYmin = NULL;
+static psVector *chipYmax = NULL;
+
+void pmSourceChipBoundsCleanup (void) {
+    psFree (chipXmin);
+    psFree (chipXmax);
+    psFree (chipYmin);
+    psFree (chipYmax);
+}
 
 bool pmSourceChipBounds (pmFPA *fpa) {

tags/ipp-ps1-20211104/psModules/src/objects/pmSourceInternal.h

@@ -55 +55 @@
 bool              pmSourceExtractFreeChipBounds(void);
 
-
 #endif