Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

return error when reaching EOF, skip reading extra elements after 'FACE'

Browse Source
This commit is contained in:
Michael Krämer
2017-02-03 18:54:01 +01:00
parent 1ae04a2284
commit c23ed24aa0
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/OpenMesh/Core/IO/reader/PLYReader.cc
View File

@@ -479,6 +479,18 @@ bool _PLYReader_::read_ascii(std::istream& _in, BaseImporter& _bi, const Options
} }
} }
} }
if (_in.eof()) {
if (err_enabled)
omerr().enable();
omerr() << "Unexpected end of file while reading." << std::endl;
return false;
}
if(e_it->element_== FACE)
// stop reading after the faces since additional elements are not preserved anyway
break;
} }
if (err_enabled) if (err_enabled)
@@ -694,6 +706,17 @@ bool _PLYReader_::read_binary(std::istream& _in, BaseImporter& _bi, bool /*_swap
} }
} }
if (_in.eof()) {
if (err_enabled)
omerr().enable();
omerr() << "Unexpected end of file while reading." << std::endl;
return false;
}
if (e_it->element_ == FACE)
// stop reading after the faces since additional elements are not preserved anyway
break;
} }
if (err_enabled) if (err_enabled)
omerr().enable(); omerr().enable();