Changeset 458 for cpp/frams

Timestamp:

02/03/16 19:19:18 (9 years ago)

Author:

sz

Message:

fixed memory leaks in Model (when building from invalid f0 genotype)

File:

• cpp/frams/model/model.cpp (modified) (4 diffs)

cpp/frams/model/model.cpp

@@ -570 +570 @@
         partparam.select(p);
         pos+=2;
-        if (partparam.load2(line,pos) & ParamInterface::LOAD2_PARSE_FAILED) return -1;
+        if (partparam.load2(line,pos) & ParamInterface::LOAD2_PARSE_FAILED) {delete p; return -1;}
         p->o.rotate(p->rot);
         parts+=p;
@@ -592 +592 @@
         pos+=2;
         j->owner=this;
-        if (jointparam.load2(line,pos) & ParamInterface::LOAD2_PARSE_FAILED) return -1;
+        if (jointparam.load2(line,pos) & ParamInterface::LOAD2_PARSE_FAILED) {delete j; return -1;}
         if ((j->p1_refno>=0)&&(j->p1_refno<getPartCount())&&
            (j->p2_refno>=0)&&(j->p2_refno<getPartCount()))
@@ -620 +620 @@
         neuroparam.select(nu);
         pos+=2;
-        if (neuroparam.load2(line,pos) & ParamInterface::LOAD2_PARSE_FAILED) return -1;
+        if (neuroparam.load2(line,pos) & ParamInterface::LOAD2_PARSE_FAILED) {delete nu; return -1;}
 #ifdef MODEL_V1_COMPATIBLE
         if (nu->neuro_refno>=0) // parent specified...
@@ -706 +706 @@
         neuroitemparam.select(nu);
         pos+=3;
-        if (neuroitemparam.load2(line,pos) & ParamInterface::LOAD2_PARSE_FAILED) return -1;
+        if (neuroitemparam.load2(line,pos) & ParamInterface::LOAD2_PARSE_FAILED) {delete nu; return -1;}
         // illegal parent?
         if ((nu->neuro_refno<0)||(nu->neuro_refno>=old_getNeuroCount()))