ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-03-03 22:15:37 +05:00
Code Issues Packages Projects Releases Wiki Activity

add check of predicate pointer before usage

Browse Source
This commit is contained in:
ptv 2006-06-26 11:11:53 +00:00
parent febe54fee1
commit 5f87b237ea
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/SMESH_I/SMESH_Filter_i.cxx
View File

@ -1784,6 +1784,7 @@ GetElementsId( Predicate_i* thePredicate,
const SMDS_Mesh* theMesh, const SMDS_Mesh* theMesh,
Controls::Filter::TIdSequence& theSequence ) Controls::Filter::TIdSequence& theSequence )
{ {
if (thePredicate)
Controls::Filter::GetElementsId(theMesh,thePredicate->GetPredicate(),theSequence); Controls::Filter::GetElementsId(theMesh,thePredicate->GetPredicate(),theSequence);
} }
@ -1793,6 +1794,7 @@ GetElementsId( Predicate_i* thePredicate,
SMESH_Mesh_ptr theMesh, SMESH_Mesh_ptr theMesh,
Controls::Filter::TIdSequence& theSequence ) Controls::Filter::TIdSequence& theSequence )
{ {
if (thePredicate)
if(const SMDS_Mesh* aMesh = MeshPtr2SMDSMesh(theMesh)) if(const SMDS_Mesh* aMesh = MeshPtr2SMDSMesh(theMesh))
Controls::Filter::GetElementsId(aMesh,thePredicate->GetPredicate(),theSequence); Controls::Filter::GetElementsId(aMesh,thePredicate->GetPredicate(),theSequence);
} }
@ -1802,7 +1804,7 @@ Filter_i::
GetElementsId( SMESH_Mesh_ptr theMesh ) GetElementsId( SMESH_Mesh_ptr theMesh )
{ {
SMESH::long_array_var anArray = new SMESH::long_array; SMESH::long_array_var anArray = new SMESH::long_array;
if(!CORBA::is_nil(theMesh)){ if(!CORBA::is_nil(theMesh) && myPredicate){
Controls::Filter::TIdSequence aSequence; Controls::Filter::TIdSequence aSequence;
GetElementsId(myPredicate,theMesh,aSequence); GetElementsId(myPredicate,theMesh,aSequence);
long i = 0, iEnd = aSequence.size(); long i = 0, iEnd = aSequence.size();