Changeset 42764

Timestamp:

Dec 13, 2024, 2:12:29 PM (19 months ago)

Author:

eugene

Message:

check for memleaks

Location:

trunk/ppMerge/src

Files:

• ppMerge.c (modified) (1 diff)
• ppMergeLoop.c (modified) (1 diff)

trunk/ppMerge/src/ppMerge.c

@@ -159 +159 @@
     psLibFinalize();
 
+    psLogMsg("ppMerge", PS_LOG_INFO, "Memory leaks: %d\\n", psMemCheckLeaks(0, NULL, stdout, false));
+
     exit(exitValue);
 }

trunk/ppMerge/src/ppMergeLoop.c

@@ -349 +349 @@
                       psArrayAdd(job->args, 1, outCell);
                       psArrayAdd(job->args, 1, fileGroup);
-                      psArrayAdd(job->args, 1, psScalarAlloc(iter, PS_TYPE_S32));
-                      psArrayAdd(job->args, 1, psScalarAlloc(rej, PS_TYPE_F32));
-                      psArrayAdd(job->args, 1, psScalarAlloc(maskVal, PS_TYPE_IMAGE_MASK));
+                      
+                      // need to free the allocated scalars:
+                      { psScalar *tmpVal = psScalarAlloc(iter,    PS_TYPE_S32);        psArrayAdd(job->args, 1, tmpVal); psFree (tmpVal); }
+                      { psScalar *tmpVal = psScalarAlloc(rej,     PS_TYPE_F32);        psArrayAdd(job->args, 1, tmpVal); psFree (tmpVal); }
+                      { psScalar *tmpVal = psScalarAlloc(maskVal, PS_TYPE_IMAGE_MASK); psArrayAdd(job->args, 1, tmpVal); psFree (tmpVal); }
 
                       // call: pmDarkCombine(outCell, fileGroup->readouts, iter, rej, maskVal);