Changeset 11147

Timestamp:

Jan 18, 2007, 4:03:14 PM (19 years ago)

Author:

Paul Price

Message:

Fixing memory corruption induced by wrong placement of "if (faulted)" block.

File:

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

trunk/ippTools/src/dettool.c

@@ -981 +981 @@
         return false;
     }
-    
+
     // lookup the detRun that we will be basing this one on
     psArray *detRuns = NULL;
@@ -999 +999 @@
         return false;                   // unreachable
     }
-   
+
     // pull the detRun object out the result array
     detRunRow *detRun = psMemIncrRefCounter(detRuns->data[0]);
- 
+
     // discard the resultarray
     psFree(detRuns)
@@ -1008 +1008 @@
     // set the det_id to 0/NULL so the database can assign it
     detRun->det_id = 0;
-    
+
     // reset the iteration to 0
     detRun->iteration = 0;
-    
+
     // reset the state to "run"
     psFree(detRun->state);
@@ -1219 +1219 @@
     psFree(detRun);
 
-    // get the det_id 
+    // get the det_id
     long newDet_id = psDBLastInsertID(config->dbh);
 
@@ -2327 +2327 @@
     }
 
-    if (!p_psDBRunQuery(config->dbh, query)) {
-        psError(PS_ERR_UNKNOWN, false, "database error");
-        psFree(query);
-        return false;
-    }
-    psFree(query);
-
     if (faulted) {
         // list only faulted rows
@@ -2341 +2334 @@
         psStringAppend(&query, " %s", "AND detProcessedImfile.fault = 0");
     }
+
+    if (!p_psDBRunQuery(config->dbh, query)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(query);
+        return false;
+    }
+    psFree(query);
 
     // treat limit == 0 as "no limit"
@@ -3255 +3255 @@
     }
 #endif
-    
+
     // treat limit == 0 as "no limit"
     if (limit) {
@@ -6068 +6068 @@
     // check that state is a valid string value
     if (!(
-            (strncmp(state, "run", 4) == 0) 
-            || (strncmp(state, "stop", 5) == 0) 
-            || (strncmp(state, "reg", 4) == 0) 
+            (strncmp(state, "run", 4) == 0)
+            || (strncmp(state, "stop", 5) == 0)
+            || (strncmp(state, "reg", 4) == 0)
         )
     ) {
@@ -6095 +6095 @@
     // check that state is a valid string value
     if (!(
-            (strncmp(mode, "master", 7) == 0) 
-            || (strncmp(mode, "verify", 7) == 0) 
+            (strncmp(mode, "master", 7) == 0)
+            || (strncmp(mode, "verify", 7) == 0)
         )
     ) {