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

Merge pull request #2905 from maxGimeno/c3t3_item-Fix-GF 

Polyhedron_demo : Add a check before trying to load a cdt_3 to avoid crashing
This commit is contained in:
Laurent Rineau 2018-03-09 18:40:34 +01:00
parent c3ac7f70c4 4ce3a55096
commit b4bfda04ca
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Polyhedron/demo/Polyhedron/Plugins/Mesh_3/C3t3_io_plugin.cpp
View File

@ -430,7 +430,28 @@ Polyhedron_demo_c3t3_binary_io_plugin::
try_load_a_cdt_3(std::istream& is, C3t3& c3t3)
{
std::cerr << "Try load a CDT_3...";
CGAL::set_binary_mode(is);
std::string s;
if(!(is >> s)) return false;
bool binary = (s == "binary");
if(binary) {
if(!(is >> s)) return false;
}
if (s != "CGAL" ||
!(is >> s) ||
s != "c3t3")
{
return false;
}
std::getline(is, s);
if(s != "") {
if(s != std::string(" ") + CGAL::Get_io_signature<Fake_CDT_3>()()) {
std::cerr << "load_binary_file:"
<< "\n expected format: " << CGAL::Get_io_signature<Fake_CDT_3>()()
<< "\n got format:" << s << std::endl;
return false;
}
}
if(binary) CGAL::set_binary_mode(is);
if(CGAL::file_input<
Fake_CDT_3,
C3t3::Triangulation,