Changeset 13576

Timestamp:

May 31, 2007, 12:52:00 PM (19 years ago)

Author:

jhoblitt

Message:

fix memory leaks

Location:

trunk/ippTools/src

Files:

• dettoolConfig.c (modified) (4 diffs)
• pxconfig.c (modified) (5 diffs)

trunk/ippTools/src/dettoolConfig.c

@@ -46 +46 @@
     psString now = psTimeToISO(time);
     psFree(time);
-
-    psMetadata *argSets = psMetadataAlloc();
-    psMetadata *modes = psMetadataAlloc();
 
     // -pending
@@ -784 +781 @@
     psFree(now);
 
-    // find which mode we're running under
+    psMetadata *argSets = psMetadataAlloc();
+    psMetadata *modes = psMetadataAlloc();
+
     PXTOOL_ADD_MODE("-pending",         "list active detruns", DETTOOL_MODE_PENDING,       pendingArgs);
     PXTOOL_ADD_MODE("-definebytag",     "", DETTOOL_MODE_DEFINEBYTAG,   definebytagArgs);
@@ -825 +824 @@
     PXTOOL_ADD_MODE("-register_detrend_imfile", "", DETTOOL_MODE_REGISTER_DETREND_IMFILE, register_detrend_imfileArgs);
 
-
     if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {
         psError(PS_ERR_UNKNOWN, true, "option parsing failed");
@@ -833 +831 @@
         return NULL;
     }
+
+    psFree(argSets);
+    psFree(modes);
 
     // setup search criterion

trunk/ippTools/src/pxconfig.c

@@ -89 +89 @@
                 fprintf(stream, "only one mode selection is allowed\n");
                 pxUsage(stream, argc, argv, modes);
+                psFree(iter);
                 return NULL;
             }
@@ -101 +102 @@
                 psError(PS_ERR_UNKNOWN, true, "can not find arguments for mode");
                 fprintf(stderr, "can not find arugments for mode");
+                psFree(iter);
                 return NULL;
             }
@@ -151 +153 @@
                 psError(PS_ERR_UNKNOWN, false, "boolean type can not be required");
                 fprintf(stderr, "boolean type can not be required\n");
+                psFree(iter);
                 return NULL;
                 break;
@@ -184 +187 @@
                 psError(PS_ERR_UNKNOWN, false, "unknown argument type");
                 fprintf(stream, "unknown argument type\n");
+                psFree(iter);
                 return NULL;
             ARG_REQUIRED:                
@@ -189 +193 @@
                 fprintf(stream, "argument %s is required\n", item->name);
                 pxUsageMode(stream, argc, argv, config->modeName, config->args);
+                psFree(iter);
                 return NULL;
         }