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

avoid crash if the file is corrupted or empty

This commit is contained in:
Sébastien Loriot 2020-02-27 10:19:35 +01:00
parent 7a5df9ea21
commit 844bfddcac
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CGAL_ImageIO/include/CGAL/read_vtk_image_data.h
View File

@ -85,6 +85,8 @@ read_vtk_image_data(vtkImageData* vtk_image, Image_3::Own owning = Image_3::OWN_
image->wdim = imageio_type.wdim; image->wdim = imageio_type.wdim;
image->wordKind = imageio_type.wordKind; image->wordKind = imageio_type.wordKind;
image->sign = imageio_type.sign; image->sign = imageio_type.sign;
if (!vtk_image->GetPointData() || !vtk_image->GetPointData()->GetScalars())
return Image_3();
CGAL_assertion(vtk_image->GetPointData()->GetScalars()->GetNumberOfTuples() == dims[0]*dims[1]*dims[2]); CGAL_assertion(vtk_image->GetPointData()->GetScalars()->GetNumberOfTuples() == dims[0]*dims[1]*dims[2]);
if(owning == Image_3::OWN_THE_DATA) { if(owning == Image_3::OWN_THE_DATA) {
image->data = ::ImageIO_alloc(dims[0]*dims[1]*dims[2]*image->wdim); image->data = ::ImageIO_alloc(dims[0]*dims[1]*dims[2]*image->wdim);