songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crash during binary I/O of Triangulation_3

This commit is contained in:
Laurent Rineau 2022-04-27 14:19:21 +02:00
parent 8a88edc676
commit ceb41bf206
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Polyhedron/demo/Polyhedron/Plugins/IO/CMakeLists.txt
View File

@ -50,7 +50,7 @@ set_package_properties(
DESCRIPTION "A library for image processing." DESCRIPTION "A library for image processing."
PURPOSE "Can be used for I/O (DICOM, VTU, VTP.") PURPOSE "Can be used for I/O (DICOM, VTU, VTP.")
polyhedron_demo_plugin(triangulation_3_io_plugin triangulation_3_io_plugin KEYWORDS IO) polyhedron_demo_plugin(triangulation_3_io_plugin triangulation_3_io_plugin KEYWORDS Viewer)
target_link_libraries(triangulation_3_io_plugin PUBLIC scene_triangulation_3_item) target_link_libraries(triangulation_3_io_plugin PUBLIC scene_triangulation_3_item)
if(VTK_FOUND) if(VTK_FOUND)

8
Triangulation_3/include/CGAL/Triangulation_3.h
View File

@ -2388,9 +2388,13 @@ std::istream& operator>> (std::istream& is, Triangulation_3<GT, Tds, Lds>& tr)
if(!is) if(!is)
return is; return is;
std::vector< Vertex_handle > V;
if(d > 3 || d < -2 || (n+1) > V.max_size()) {
is.setstate(std::ios_base::failbit);
return is;
}
tr._tds.set_dimension(d); tr._tds.set_dimension(d);
V.resize(n+1);
std::vector< Vertex_handle > V(n+1);
V[0] = tr.infinite_vertex(); // the infinite vertex is numbered 0 V[0] = tr.infinite_vertex(); // the infinite vertex is numbered 0
for(std::size_t i=1; i <= n; i++) for(std::size_t i=1; i <= n; i++)