Changeset 6743 for branches/rel10_ifa/psModules/src/astrom/pmFPAConstruct.c

Timestamp:

Mar 30, 2006, 3:33:07 PM (20 years ago)

Author:

Paul Price

Message:

Plugging memory leaks --- done.

File:

• branches/rel10_ifa/psModules/src/astrom/pmFPAConstruct.c (modified) (2 diffs)

branches/rel10_ifa/psModules/src/astrom/pmFPAConstruct.c

@@ -373 +373 @@
 
                 // Put in the extension
-                if (chip->hdu) {
-                    if (chip->hdu != hdu) {
-                        psLogMsg(__func__, PS_LOG_WARN, "Overwriting HDU in chip %s\n", chipName);
-                        psFree(chip->hdu);  // Make way!
-                    }
-                } else {
+                if (chip->hdu && chip->hdu != hdu) {
+                    psLogMsg(__func__, PS_LOG_WARN, "Overwriting HDU in chip %s\n", chipName);
+                    psFree(chip->hdu);  // Make way!
+                    chip->hdu = NULL;
+                }
+                if (!chip->hdu) {
                     chip->hdu = psMemIncrRefCounter(hdu);
                 }
@@ -437 +437 @@
 
                 // Put in the extension
-                if (cell->hdu) {
-                    if (cell->hdu != hdu) {
-                        psLogMsg(__func__, PS_LOG_WARN, "Overwriting HDU in chip %s, cell %s\n", chipName,
-                                 cellName);
-                        psFree(cell->hdu);
-                    }
-                } else {
+                if (cell->hdu && cell->hdu != hdu) {
+                    psLogMsg(__func__, PS_LOG_WARN, "Overwriting HDU in chip %s, cell %s\n", chipName,
+                             cellName);
+                    psFree(cell->hdu);
+                    cell->hdu = NULL;
+                }
+                if (! cell->hdu) {
                     cell->hdu = psMemIncrRefCounter(hdu);
                 }