kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

TD: Fix memory leaks with PySequence_GetItem

Browse Source
This commit is contained in:
wmayer
2024-05-09 00:03:01 +02:00
parent 03a371d6e3
commit 85d3d9eec0
5 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Mod/TechDraw/App/DrawViewPartPyImp.cpp
View File

@@ -314,15 +314,14 @@ PyObject* DrawViewPartPy::removeCosmeticVertex(PyObject *args)
}
if (PySequence_Check(pDelList)) {
Py_ssize_t nSize = PySequence_Size(pDelList);
for (Py_ssize_t i=0; i < nSize; i++) {
PyObject* item = PySequence_GetItem(pDelList, i);
if (!PyObject_TypeCheck(item, &(TechDraw::CosmeticVertexPy::Type))) {
Py::Sequence sequence(pDelList);
for (const auto& item : sequence) {
if (!PyObject_TypeCheck(item.ptr(), &(TechDraw::CosmeticVertexPy::Type))) {
PyErr_Format(PyExc_TypeError ,"Types in sequence must be 'CosmeticVertex', not %s",
Py_TYPE(item)->tp_name);
Py_TYPE(item.ptr())->tp_name);
return nullptr;
}
TechDraw::CosmeticVertexPy* cvPy = static_cast<TechDraw::CosmeticVertexPy*>(item);
TechDraw::CosmeticVertexPy* cvPy = static_cast<TechDraw::CosmeticVertexPy*>(item.ptr());
TechDraw::CosmeticVertex* cv = cvPy->getCosmeticVertexPtr();
dvp->removeCosmeticVertex(cv->getTagAsString());
}

11
src/Mod/TechDraw/App/PropertyCenterLineList.cpp
View File

@@ -95,19 +95,20 @@ PyObject *PropertyCenterLineList::getPyObject()
void PropertyCenterLineList::setPyObject(PyObject *value)
{
if (PySequence_Check(value)) {
Py_ssize_t nSize = PySequence_Size(value);
Py::Sequence sequence(value);
Py_ssize_t nSize = sequence.size();
std::vector<CenterLine*> values;
values.resize(nSize);
for (Py_ssize_t i=0; i < nSize; ++i) {
PyObject* item = PySequence_GetItem(value, i);
if (!PyObject_TypeCheck(item, &(CenterLinePy::Type))) {
Py::Object item = sequence.getItem(i);
if (!PyObject_TypeCheck(item.ptr(), &(CenterLinePy::Type))) {
std::string error = std::string("types in list must be 'CenterLine', not ");
error += item->ob_type->tp_name;
error += item.ptr()->ob_type->tp_name;
throw Base::TypeError(error);
}
values[i] = static_cast<CenterLinePy*>(item)->getCenterLinePtr();
values[i] = static_cast<CenterLinePy*>(item.ptr())->getCenterLinePtr();
}
setValues(values);

11
src/Mod/TechDraw/App/PropertyCosmeticEdgeList.cpp
View File

@@ -99,19 +99,20 @@ PyObject *PropertyCosmeticEdgeList::getPyObject()
void PropertyCosmeticEdgeList::setPyObject(PyObject *value)
{
if (PySequence_Check(value)) {
Py_ssize_t nSize = PySequence_Size(value);
Py::Sequence sequence(value);
Py_ssize_t nSize = sequence.size();
std::vector<CosmeticEdge*> values;
values.resize(nSize);
for (Py_ssize_t i=0; i < nSize; ++i) {
PyObject* item = PySequence_GetItem(value, i);
if (!PyObject_TypeCheck(item, &(CosmeticEdgePy::Type))) {
Py::Object item = sequence.getItem(i);
if (!PyObject_TypeCheck(item.ptr(), &(CosmeticEdgePy::Type))) {
std::string error = std::string("types in list must be 'CosmeticEdge', not ");
error += item->ob_type->tp_name;
error += item.ptr()->ob_type->tp_name;
throw Base::TypeError(error);
}
values[i] = static_cast<CosmeticEdgePy*>(item)->getCosmeticEdgePtr();
values[i] = static_cast<CosmeticEdgePy*>(item.ptr())->getCosmeticEdgePtr();
}
setValues(values);

11
src/Mod/TechDraw/App/PropertyCosmeticVertexList.cpp
View File

@@ -97,19 +97,20 @@ void PropertyCosmeticVertexList::setPyObject(PyObject *value)
// check container of this property to notify about changes
if (PySequence_Check(value)) {
Py_ssize_t nSize = PySequence_Size(value);
Py::Sequence sequence(value);
Py_ssize_t nSize = sequence.size();
std::vector<CosmeticVertex*> values;
values.resize(nSize);
for (Py_ssize_t i=0; i < nSize; ++i) {
PyObject* item = PySequence_GetItem(value, i);
if (!PyObject_TypeCheck(item, &(CosmeticVertexPy::Type))) {
Py::Object item = sequence.getItem(i);
if (!PyObject_TypeCheck(item.ptr(), &(CosmeticVertexPy::Type))) {
std::string error = std::string("types in list must be 'CosmeticVertex', not ");
error += item->ob_type->tp_name;
error += item.ptr()->ob_type->tp_name;
throw Base::TypeError(error);
}
values[i] = static_cast<CosmeticVertexPy*>(item)->getCosmeticVertexPtr();
values[i] = static_cast<CosmeticVertexPy*>(item.ptr())->getCosmeticVertexPtr();
}
setValues(values);

11
src/Mod/TechDraw/App/PropertyGeomFormatList.cpp
View File

@@ -107,19 +107,20 @@ void PropertyGeomFormatList::setPyObject(PyObject *value)
// Part2DObject* part2d = dynamic_cast<Part2DObject*>(this->getContainer());
if (PySequence_Check(value)) {
Py_ssize_t nSize = PySequence_Size(value);
Py::Sequence sequence(value);
Py_ssize_t nSize = sequence.size();
std::vector<GeomFormat*> values;
values.resize(nSize);
for (Py_ssize_t i=0; i < nSize; ++i) {
PyObject* item = PySequence_GetItem(value, i);
if (!PyObject_TypeCheck(item, &(GeomFormatPy::Type))) {
Py::Object item = sequence.getItem(i);
if (!PyObject_TypeCheck(item.ptr(), &(GeomFormatPy::Type))) {
std::string error = std::string("types in list must be 'GeomFormat', not ");
error += item->ob_type->tp_name;
error += item.ptr()->ob_type->tp_name;
throw Base::TypeError(error);
}
values[i] = static_cast<GeomFormatPy*>(item)->getGeomFormatPtr();
values[i] = static_cast<GeomFormatPy*>(item.ptr())->getGeomFormatPtr();
}
setValues(values);