Changeset 24489

Timestamp:

Jun 18, 2009, 2:59:07 PM (17 years ago)

Author:

Paul Price

Message:

Don't allocate before a return --- plugging memory leak.

File:

• trunk/psModules/src/objects/pmSourceIO_MatchedRefs.c (modified) (4 diffs)

trunk/psModules/src/objects/pmSourceIO_MatchedRefs.c

@@ -49 +49 @@
     pmCell *cell = NULL;
     pmReadout *readout = NULL;
-    pmFPAview *view = pmFPAviewAlloc (0);
 
     // first, check if there are any matches to be written
@@ -57 +56 @@
     psMetadata *recipe = psMetadataLookupMetadata(&status, config->recipes, "PSASTRO");
     if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "missing recipe PSASTRO in config data");
-        return false;
+        psError(PS_ERR_UNKNOWN, true, "missing recipe PSASTRO in config data");
+        return false;
     }
 
@@ -65 +64 @@
 
     psArray *table = psArrayAllocEmpty (0x1000);
+    pmFPAview *view = pmFPAviewAlloc (0);
 
     // this loop selects the matched stars for all chips
@@ -70 +70 @@
         psTrace ("psastro", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
         if (!chip->process || !chip->file_exists) continue;
-        
-        char *chipName = psMetadataLookupStr(NULL, chip->concepts, "CHIP.NAME");
 
-        while ((cell = pmFPAviewNextCell (view, fpa, 1)) != NULL) {
+        char *chipName = psMetadataLookupStr(NULL, chip->concepts, "CHIP.NAME");
+
+        while ((cell = pmFPAviewNextCell (view, fpa, 1)) != NULL) {
             psTrace ("psastro", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
             if (!cell->process || !cell->file_exists) continue;
 
-            // process each of the readouts
-            // XXX there can only be one readout per chip, right?
-            while ((readout = pmFPAviewNextReadout (view, fpa, 1)) != NULL) {
-                if (! readout->data_exists) continue;
+            // process each of the readouts
+            // XXX there can only be one readout per chip, right?
+            while ((readout = pmFPAviewNextReadout (view, fpa, 1)) != NULL) {
+                if (! readout->data_exists) continue;
 
-                // select the raw objects for this readout
-                psArray *rawstars = psMetadataLookupPtr (NULL, readout->analysis, "PSASTRO.RAWSTARS");
-                if (rawstars == NULL) continue;
+                // select the raw objects for this readout
+                psArray *rawstars = psMetadataLookupPtr (NULL, readout->analysis, "PSASTRO.RAWSTARS");
+                if (rawstars == NULL) continue;
 
-                // select the raw objects for this readout
-                psArray *refstars = psMetadataLookupPtr (NULL, readout->analysis, "PSASTRO.REFSTARS");
-                if (refstars == NULL) continue;
-                psTrace ("psastro", 4, "Trying %ld refstars\n", refstars->n);
+                // select the raw objects for this readout
+                psArray *refstars = psMetadataLookupPtr (NULL, readout->analysis, "PSASTRO.REFSTARS");
+                if (refstars == NULL) continue;
+                psTrace ("psastro", 4, "Trying %ld refstars\n", refstars->n);
 
-                psArray *matches = psMetadataLookupPtr (NULL, readout->analysis, "PSASTRO.MATCH");
-                if (matches == NULL) continue;
+                psArray *matches = psMetadataLookupPtr (NULL, readout->analysis, "PSASTRO.MATCH");
+                if (matches == NULL) continue;
 
-                for (int i = 0; i < matches->n; i++) {
-                    pmAstromMatch *match = matches->data[i];
+                for (int i = 0; i < matches->n; i++) {
+                    pmAstromMatch *match = matches->data[i];
 
-                    pmAstromObj *raw = rawstars->data[match->raw];
-                    pmAstromObj *ref = refstars->data[match->ref];
+                    pmAstromObj *raw = rawstars->data[match->raw];
+                    pmAstromObj *ref = refstars->data[match->ref];
 
-                    psMetadata *row = psMetadataAlloc ();
-                    psMetadataAdd (row, PS_LIST_TAIL, "RA",       PS_DATA_F64, "right ascension (deg, J2000)", PM_DEG_RAD*ref->sky->r);
-                    psMetadataAdd (row, PS_LIST_TAIL, "DEC",      PS_DATA_F64, "declination (deg, J2000)",     PM_DEG_RAD*ref->sky->d);
-                    psMetadataAdd (row, PS_LIST_TAIL, "X_CHIP",   PS_DATA_F32, "x coord on chip",              raw->chip->x);
-                    psMetadataAdd (row, PS_LIST_TAIL, "Y_CHIP",   PS_DATA_F32, "y coord on chip",              raw->chip->y);   
-                    psMetadataAdd (row, PS_LIST_TAIL, "X_FPA",    PS_DATA_F32, "x coord on focal plane",       raw->FP->x);
-                    psMetadataAdd (row, PS_LIST_TAIL, "Y_FPA",    PS_DATA_F32, "y coord on focal plane",       raw->FP->y);
-                    psMetadataAdd (row, PS_LIST_TAIL, "MAG_INST", PS_DATA_F32, "instrumental magnitude",       raw->Mag);
-                    psMetadataAdd (row, PS_LIST_TAIL, "MAG_REF",  PS_DATA_F32, "reference star magnitude",     ref->Mag);
-                    psMetadataAdd (row, PS_LIST_TAIL, "COLOR_REF",PS_DATA_F32, "reference star color",         ref->Color);
-                    psMetadataAdd (row, PS_LIST_TAIL, "CHIP_ID",  PS_DATA_STRING, "chip identifier",           chipName);
-                    // XXX need to add the reference color, but this needs getstar / dvo.photcodes for the reference to be refined.
+                    psMetadata *row = psMetadataAlloc ();
+                    psMetadataAdd (row, PS_LIST_TAIL, "RA",       PS_DATA_F64, "right ascension (deg, J2000)", PM_DEG_RAD*ref->sky->r);
+                    psMetadataAdd (row, PS_LIST_TAIL, "DEC",      PS_DATA_F64, "declination (deg, J2000)",     PM_DEG_RAD*ref->sky->d);
+                    psMetadataAdd (row, PS_LIST_TAIL, "X_CHIP",   PS_DATA_F32, "x coord on chip",              raw->chip->x);
+                    psMetadataAdd (row, PS_LIST_TAIL, "Y_CHIP",   PS_DATA_F32, "y coord on chip",              raw->chip->y);
+                    psMetadataAdd (row, PS_LIST_TAIL, "X_FPA",    PS_DATA_F32, "x coord on focal plane",       raw->FP->x);
+                    psMetadataAdd (row, PS_LIST_TAIL, "Y_FPA",    PS_DATA_F32, "y coord on focal plane",       raw->FP->y);
+                    psMetadataAdd (row, PS_LIST_TAIL, "MAG_INST", PS_DATA_F32, "instrumental magnitude",       raw->Mag);
+                    psMetadataAdd (row, PS_LIST_TAIL, "MAG_REF",  PS_DATA_F32, "reference star magnitude",     ref->Mag);
+                    psMetadataAdd (row, PS_LIST_TAIL, "COLOR_REF",PS_DATA_F32, "reference star color",         ref->Color);
+                    psMetadataAdd (row, PS_LIST_TAIL, "CHIP_ID",  PS_DATA_STRING, "chip identifier",           chipName);
+                    // XXX need to add the reference color, but this needs getstar / dvo.photcodes for the reference to be refined.
 
-                    psArrayAdd (table, 100, row);
-                    psFree (row);
-                }
-            }
-        }
+                    psArrayAdd (table, 100, row);
+                    psFree (row);
+                }
+            }
+        }
     }
     psFree (view);
 
     if (table->n == 0) {
-        psFree(table);
-        return true;
+        psFree(table);
+        return true;
     }