Changeset 804 for cpp/frams/genetics/f4

Timestamp:

06/07/18 17:43:19 (7 years ago)

Author:

Maciej Komosinski

Message:

Fixed memory leak and uninitialized int

File:

• cpp/frams/genetics/f4/f4_conv.cpp (modified) (4 diffs)

cpp/frams/genetics/f4/f4_conv.cpp

@@ -30 +30 @@
         f4_Model *model = new f4_Model();
         res = model->buildFromF4(in, using_checkpoints);
-        if (GENOPER_OK != res) return SString();  // oops
+        if (GENOPER_OK != res)
+        {
+                delete model;
+                return SString();  // oops
+        }
         if (NULL != map)
                 // generate to-f0 conversion map
@@ -54 +58 @@
         f4_Model *model = new f4_Model();
         res = model->buildFromF4(in, using_checkpoints);
-        if (GENOPER_OK != res) return SString();  // oops
+        if (GENOPER_OK != res)
+        {
+                delete model;
+                return SString();  // oops
+        }
         SString out;
         model->toF1Geno(out);
@@ -302 +310 @@
                                 if (C->links[j]->t == "*" || C->links[j]->t == "S" || C->links[j]->t == "T")
                                 {
+                                        partno = C->dadlink->p2_refno;
                                         sprintf(tmpLine, "p=%d,d=\"%s\"", partno, nclass);
                                 }
@@ -315 +324 @@
                                 else if (sensortest->getPreferredLocation() == 1)
                                 {
+                                        partno = C->dadlink->p2_refno;
                                         sprintf(tmpLine, "p=%d,d=\"%s\"", partno, nclass);
                                 }