Changeset 7678

Timestamp:

Jun 23, 2006, 5:44:59 PM (20 years ago)

Author:

jhoblitt

Message:

fix memory leaks

File:

• trunk/ippTools/src/dettool.c (modified) (15 diffs)

trunk/ippTools/src/dettool.c

@@ -654 +654 @@
     if (!detProcessedImfileInsertObject(config->dbh, detRow)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(detRow);
         return false; 
     }
+
+    psFree(detRow);
 
     return true;
@@ -988 +991 @@
 
     psArray *rawImfiles = searchRawImfiles(config, where);
+    psFree(where);
 
     bool valid_class_id = false;
@@ -1014 +1018 @@
     if (!detStackedImfileInsertObject(config->dbh, stackedImfile)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(stackedImfile);
         return false; 
     }
+
+    psFree(stackedImfile);
 
     return true;
@@ -1072 +1079 @@
                 NULL, md
             );
+            psFree(md);
         }
 
@@ -1147 +1155 @@
             psArrayLength(valid_class_ids));
         psFree(valid_class_ids);
+        psFree(stackedImfiles);
         return false;
     }
@@ -1160 +1169 @@
             NULL, md
         );
-    }
+        psFree(md);
+    }
+    psFree(stackedImfiles);
 
     psString str = psMetadataConfigFormat(output); 
@@ -1239 +1250 @@
                     ((detInputExpRow *)inputExps->data[i])->exp_id)) {
                 psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id");
+                psFree(inputExps);
                 psFree(where);
                 return NULL;
             }
         }
+        psFree(inputExps);
         rawImfiles = rawImfileSelectRowObjects(config->dbh, where, 0);
         // XXX this really should be sorted for uniqueness
@@ -1333 +1346 @@
     psArray *stackedImfiles = detStackedImfileSelectRowObjects(
                                 config->dbh, where, 0);
+    psFree(where);
 
     bool valid_class_id = false;
@@ -1361 +1375 @@
     if (!detNormalizedImfileInsertObject(config->dbh, masterImfile)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(masterImfile);
         return false; 
     }
+
+    psFree(masterImfile);
 
     return true;
@@ -1431 +1448 @@
             NULL, md
         );
-    }
+        psFree(md);
+    }
+    psFree(normalizedImfiles);
 
     psString str = psMetadataConfigFormat(output); 
@@ -1509 +1528 @@
             NULL, md
         );
+        psFree(md);
     }
 
@@ -1668 +1688 @@
                 PS_META_DUPLICATE_OK, NULL, md
             );
+            psFree(md);
         }
 
@@ -1808 +1829 @@
                 PS_META_DUPLICATE_OK, NULL, md
             );
+            psFree(md);
         }
 
@@ -1889 +1911 @@
                 PS_META_DUPLICATE_OK, NULL, md
             );
+            psFree(md);
         }
 
@@ -1925 +1948 @@
                 PS_META_DUPLICATE_OK, NULL, md
             );
+            psFree(md);
         }