suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix memory leak in SketchObject::transferConstraints

Browse Source
This commit is contained in:
wmayer 2016-10-24 14:35:24 +02:00
parent 9c1134940b
commit bf129d3a33
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Mod/Sketcher/App/SketchObject.cpp
View File

@ -887,6 +887,7 @@ int SketchObject::transferConstraints(int fromGeoId, PointPos fromPosId, int toG
{ {
const std::vector<Constraint *> &vals = this->Constraints.getValues(); const std::vector<Constraint *> &vals = this->Constraints.getValues();
std::vector<Constraint *> newVals(vals); std::vector<Constraint *> newVals(vals);
std::vector<Constraint *> changed;
for (int i=0; i < int(newVals.size()); i++) { for (int i=0; i < int(newVals.size()); i++) {
if (vals[i]->First == fromGeoId && vals[i]->FirstPos == fromPosId && if (vals[i]->First == fromGeoId && vals[i]->FirstPos == fromPosId &&
!(vals[i]->Second == toGeoId && vals[i]->SecondPos == toPosId)) { !(vals[i]->Second == toGeoId && vals[i]->SecondPos == toPosId)) {
@ -894,15 +895,25 @@ int SketchObject::transferConstraints(int fromGeoId, PointPos fromPosId, int toG
constNew->First = toGeoId; constNew->First = toGeoId;
constNew->FirstPos = toPosId; constNew->FirstPos = toPosId;
newVals[i] = constNew; newVals[i] = constNew;
} else if (vals[i]->Second == fromGeoId && vals[i]->SecondPos == fromPosId && changed.push_back(constNew);
!(vals[i]->First == toGeoId && vals[i]->FirstPos == toPosId)) { }
else if (vals[i]->Second == fromGeoId && vals[i]->SecondPos == fromPosId &&
!(vals[i]->First == toGeoId && vals[i]->FirstPos == toPosId)) {
Constraint *constNew = newVals[i]->clone(); Constraint *constNew = newVals[i]->clone();
constNew->Second = toGeoId; constNew->Second = toGeoId;
constNew->SecondPos = toPosId; constNew->SecondPos = toPosId;
newVals[i] = constNew; newVals[i] = constNew;
changed.push_back(constNew);
} }
} }
this->Constraints.setValues(newVals);
// assign the new values only if something has changed
if (!changed.empty()) {
this->Constraints.setValues(newVals);
// free memory
for (Constraint* it : changed)
delete it;
}
return 0; return 0;
} }