manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added check for file path length when opening a mesh with the generic importer

This commit is contained in:
Luigi Malomo 2021-02-10 12:33:03 +01:00
parent de8569a483
commit 4ae9537e75
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wrap/io_trimesh/import.h
View File

@ -115,7 +115,12 @@ static int Open(OpenMeshType &m, const char *filename, CallBackPos *cb=0)
static int Open(OpenMeshType &m, const char *filename, int &loadmask, CallBackPos *cb=0) static int Open(OpenMeshType &m, const char *filename, int &loadmask, CallBackPos *cb=0)
{ {
int err; int err;
if(FileExtension(filename,"ply")) if (strlen(filename) < 3)
{
err = -1;
LastType()=KT_UNKNOWN;
}
else if(FileExtension(filename,"ply"))
{ {
err = ImporterPLY<OpenMeshType>::Open(m, filename, loadmask, cb); err = ImporterPLY<OpenMeshType>::Open(m, filename, loadmask, cb);
LastType()=KT_PLY; LastType()=KT_PLY;
@ -140,7 +145,7 @@ static int Open(OpenMeshType &m, const char *filename, int &loadmask, CallBackPo
err = ImporterVMI<OpenMeshType>::Open(m, filename, loadmask, cb); err = ImporterVMI<OpenMeshType>::Open(m, filename, loadmask, cb);
LastType()=KT_VMI; LastType()=KT_VMI;
} }
else { else {
err=1; err=1;
LastType()=KT_UNKNOWN; LastType()=KT_UNKNOWN;
} }
@ -152,7 +157,7 @@ static bool ErrorCritical(int error)
{ {
switch(LastType()) switch(LastType())
{ {
case KT_PLY : return (error>0); break; case KT_PLY : return ImporterPLY<OpenMeshType>::ErrorCritical(error); break;
case KT_STL : return (error>0); break; case KT_STL : return (error>0); break;
case KT_OFF : return (error>0); break; case KT_OFF : return (error>0); break;
case KT_OBJ : return ImporterOBJ<OpenMeshType>::ErrorCritical(error); break; case KT_OBJ : return ImporterOBJ<OpenMeshType>::ErrorCritical(error); break;