Changeset 16200

Timestamp:

Jan 23, 2008, 11:28:15 AM (18 years ago)

Author:

eugene

Message:

do not free newExp too early; check for end_stage is NULL before using

File:

• trunk/ippTools/src/regtool.c (modified) (6 diffs)

trunk/ippTools/src/regtool.c

@@ -628 +628 @@
     tess_id   = tess_id ? tess_id : newExp->tess_id;
     end_stage = end_stage ? end_stage : newExp->end_stage;
-
-    psFree(newExp);
+    // don't free newExp until just before we return, or these refs will break
 
     if (!rawExpInsert(config->dbh,
@@ -694 +693 @@
         }
         psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(newExp);
         return false;
     }
@@ -704 +704 @@
         }
         psError(PS_ERR_UNKNOWN, false, "failed to change newExp.state for exp_id: %s", exp_id);
+        psFree(newExp);
         return false;
     }
 
     // should we stop here and proceed on to the chip stage?
-    if (psStrcasestr(end_stage, "reg")) {
+    // NULL for end_stage means go as far as possible
+    if (end_stage && psStrcasestr(end_stage, "reg")) {
         // then we are done here
         if (!psDBCommit(config->dbh)) {
@@ -715 +717 @@
         }
 
+        psFree(newExp);
         return true;
     }
@@ -737 +740 @@
         }
         psError(PS_ERR_UNKNOWN, false, "failed to queue chipPendingExp");
+        psFree(newExp);
         return false;
     }
@@ -742 +746 @@
     if (!psDBCommit(config->dbh)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
-        return false;
-    }
-
+        psFree(newExp);
+        return false;
+    }
+
+    psFree(newExp);
     return true;
 }