Changeset 35228

Timestamp:

Mar 4, 2013, 2:37:14 PM (13 years ago)

Author:

bills

Message:

Fix SEGV in addtool -processedexp by defaulting stage to "cam"

Location:

trunk/ippTools/src

Files:

• addtool.c (modified) (1 diff)
• addtoolConfig.c (modified) (1 diff)

trunk/ippTools/src/addtool.c

@@ -988 +988 @@
     if (strcmp (stage,"cam") == 0) {
       query = pxDataGet("addtool_find_processedexp_cam.sql");
-    }
-    if (strcmp (stage,"stack") == 0) {
+    } else if (strcmp (stage,"stack") == 0) {
       query = pxDataGet("addtool_find_processedexp_stack.sql");
-    }
-    if (strcmp (stage,"staticsky") == 0) {
+    } else if (strcmp (stage,"staticsky") == 0) {
       query = pxDataGet("addtool_find_processedexp_staticsky_multi.sql");
-    }
-    if (strcmp (stage,"skycal") == 0) {
+    } else if (strcmp (stage,"skycal") == 0) {
       query = pxDataGet("addtool_find_processedexp_skycal.sql");
+    } else {
+        psFree(where);
+        psError(PXTOOLS_ERR_CONFIG, false, "can't find sql file for stage %s", stage);
+        return false;
     }
 

trunk/ippTools/src/addtoolConfig.c

@@ -125 +125 @@
     psMetadataAddS64(processedexpArgs, PS_LIST_TAIL, "-add_id",   0,            "search by add_id", 0);
     psMetadataAddS64(processedexpArgs, PS_LIST_TAIL, "-stage_id",   0,            "search by stage_id", 0);
-    psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-stage",             0, "set the stage", NULL);
+    psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-stage",             0, "set the stage", "cam");
     pxcamSetSearchArgs(processedexpArgs);
     psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by addRun label", NULL);