Index: trunk/psModules/src/camera/pmFPAfile.c
===================================================================
--- trunk/psModules/src/camera/pmFPAfile.c	(revision 14647)
+++ trunk/psModules/src/camera/pmFPAfile.c	(revision 14889)
@@ -27,8 +27,10 @@
     psTrace ("pmFPAfileFree", 5, "freeing %s\n", file->name);
     psFree (file->fpa);
+    psFree (file->src);
     psFree (file->readout);
     psFree (file->names);
 
     psFree (file->camera);
+    psFree (file->cameraName);
     psFree (file->format);
     psFree (file->formatName);
@@ -73,4 +75,5 @@
 
     file->camera = NULL;
+    file->cameraName = NULL;
     file->format = NULL;
     file->formatName = NULL;
@@ -175,8 +178,8 @@
 
     if (strstr (newName, "{FPA.NAME}") != NULL) {
-	char *name = psMetadataLookupStr (NULL, fpa->concepts, "FPA.NAME");
-	if (name != NULL) {
-	    psStringSubstitute(&newName, "fpa", "{FPA.NAME}");
-	}
+        char *name = psMetadataLookupStr (NULL, fpa->concepts, "FPA.NAME");
+        if (name != NULL) {
+            psStringSubstitute(&newName, "fpa", "{FPA.NAME}");
+        }
     }
     if (strstr (newName, "{CHIP.NAME}") != NULL) {