Changeset 17219

Timestamp:

Mar 28, 2008, 4:21:20 PM (18 years ago)

Author:

jhoblitt

Message:

-updaterun memleak fixes

Location:

trunk/ippTools/src

Files:

• camtool.c (modified) (3 diffs)
• chiptool.c (modified) (3 diffs)
• warptool.c (modified) (4 diffs)
• warptoolConfig.c (modified) (1 diff)

trunk/ippTools/src/camtool.c

@@ -352 +352 @@
     if ((!state) && (!label)) {
         psError(PXTOOLS_ERR_DATA, false, "parameters are required");
+        psFree(where);
         return false;
     }
@@ -358 +359 @@
         // set chipRun.state to state
         if (!pxcamRunSetStateByQuery(config, where, state)) {
+            psFree(where);
             return false;
         }
@@ -365 +367 @@
         // set chipRun.label to label
         if (!pxcamRunSetLabelByQuery(config, where, label)) {
-            return false;
-        }
-    }
+            psFree(where);
+            return false;
+        }
+    }
+
+    psFree(where);
 
     return true;

trunk/ippTools/src/chiptool.c

@@ -327 +327 @@
     if ((!state) && (!label)) {
         psError(PXTOOLS_ERR_DATA, false, "parameters are required");
+        psFree(where);
         return false;
     }
@@ -333 +334 @@
         // set chipRun.state to state
         if (!pxchipRunSetStateByQuery(config, where, state)) {
+            psFree(where);
             return false;
         }
@@ -340 +342 @@
         // set chipRun.label to label
         if (!pxchipRunSetLabelByQuery(config, where, label)) {
-            return false;
-        }
-    }
+            psFree(where);
+            return false;
+        }
+    }
+
+    psFree(where);
 
     return true;

trunk/ippTools/src/warptool.c

@@ -256 +256 @@
     PXOPT_COPY_F32(config->args, where, "-solang_max", "solang", "<");
 
-    if (!psListLength(where->list)) {
+    if (!psListLength(where->list)
+        && !psMetadataLookupBool(NULL, config->args, "-all")) {
         psFree(where);
+        where = NULL;
         psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
         return false;
@@ -267 +269 @@
     if ((!state) && (!label)) {
         psError(PXTOOLS_ERR_DATA, false, "parameters are required");
+        psFree(where);
         return false;
     }
@@ -273 +276 @@
         // set chipRun.state to state
         if (!pxwarpRunSetStateByQuery(config, where, state)) {
+            psFree(where);
             return false;
         }
@@ -280 +284 @@
         // set chipRun.label to label
         if (!pxwarpRunSetLabelByQuery(config, where, label)) {
-            return false;
-        }
-    }
+            psFree(where);
+            return false;
+        }
+    }
+
+    psFree(where);
 
     return true;

trunk/ippTools/src/warptoolConfig.c

@@ -159 +159 @@
             "define max solar angle", NAN);
 
+    psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-all",  0,
+            "allow everything to be queued without search terms", false);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0,
             "set state", NULL);