ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-02-03 16:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_access_of_empty_WP_wires' into 'master'

Browse Source 
Avoid out-of-bounds access in OCC WP and ListOfShapes

See merge request ngsolve/netgen!545
This commit is contained in:
Schöberl, Joachim 2022-12-20 13:52:43 +01:00
commit c631efd6b5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libsrc/occ/python_occ_shapes.cpp
View File

@ -632,9 +632,11 @@ public:
return shared_from_this(); return shared_from_this();
} }
TopoDS_Wire Last() optional<TopoDS_Wire> Last()
{ {
return wires.back(); return wires.empty() ?
optional<TopoDS_Wire>{} :
optional<TopoDS_Wire>{wires.back()};
} }
TopoDS_Face Face() TopoDS_Face Face()
@ -1567,7 +1569,7 @@ DLL_HEADER void ExportNgOCCShapes(py::module &m)
}, },
py::keep_alive<0, 1>() /* Essential: keep object alive while iterator exists */) py::keep_alive<0, 1>() /* Essential: keep object alive while iterator exists */)
.def("__getitem__", [](const ListOfShapes & list, size_t i) { .def("__getitem__", [](const ListOfShapes & list, size_t i) {
return CastShape(list[i]); }) return CastShape(list.at(i)); })
.def("__getitem__", [](const ListOfShapes & self, py::slice inds) { .def("__getitem__", [](const ListOfShapes & self, py::slice inds) {
size_t start, step, n, stop; size_t start, step, n, stop;