From: apo <apo@opencascade.com>
Date: Tue, 2 May 2006 12:09:55 +0000 (+0000)
Subject: Fix for Bug12202
X-Git-Tag: mergeto_trunk_06May06~10
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=97948ceb8ed81f516f4abc99623409708effb3fe;p=modules%2Fvisu.git

Fix for Bug12202
	TC: CRASH after import of "test18.med" file in MESH module.
---

diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx
index a83cb552..9f678c4e 100644
--- a/src/CONVERTOR/VISU_MedConvertor.cxx
+++ b/src/CONVERTOR/VISU_MedConvertor.cxx
@@ -1112,36 +1112,38 @@ VISU_MedConvertor
       aMesh->myMeshInfo = aMeshInfo;
       aMesh->myNamedPointCoords(new TMEDNamedPointCoords());
       
+      INITMSG(MYDEBUG,"aMeshName = '"<<aMeshName<<
+	      "; aDim = "<<aDim<<"\n");
+
       if(aType == MED::eNON_STRUCTURE){
 
-	MED::PNodeInfo aNodeInfo = aMed->GetPNodeInfo(aMeshInfo);
-      
-	MED::TEntityInfo anEntityInfo = aMed->GetEntityInfo(aMeshInfo);
+	if(MED::PNodeInfo aNodeInfo = aMed->GetPNodeInfo(aMeshInfo)){
+	  MED::TEntityInfo anEntityInfo = aMed->GetEntityInfo(aMeshInfo);
 
-	aMesh->myNbPoints = aNodeInfo->GetNbElem();
-	aMesh->myEntityInfo = anEntityInfo;
+	  aMesh->myNbPoints = aNodeInfo->GetNbElem();
+	  aMesh->myEntityInfo = anEntityInfo;
 	
-	INITMSG(MYDEBUG,"aMeshName = '"<<aMeshName<<
-		"'; myNbPoints = "<<aMesh->myNbPoints<<
-		"; aDim = "<<aDim<<"\n");
 	
 #ifndef _DEXCEPT_
-	try{
+	  try{
 #endif
-	  BEGMSG(MYDEBUG,"anEntityInfo.size() = "<<anEntityInfo.size()<<"\n");
-	  
-	  BuildMeshOnEntityMap(aMesh,
-			       anEntityInfo,
-			       aNodeInfo,
+	    INITMSG(MYDEBUG,"myNbPoints = "<<aMesh->myNbPoints<<
+		    "; anEntityInfo.size() = "<<anEntityInfo.size()<<
+		    "\n");
+	    
+	    BuildMeshOnEntityMap(aMesh,
+				 anEntityInfo,
+				 aNodeInfo,
 			       aMed);
-	  
+	    
 #ifndef _DEXCEPT_
-	}catch(std::exception& exc){
-	  MSG(MYDEBUG,"Follow exception was occured in:\n"<<exc.what());
-	}catch(...){
-	  MSG(MYDEBUG,"Unknown exception !!!");
-	}
+	  }catch(std::exception& exc){
+	    MSG(MYDEBUG,"Follow exception was occured in:\n"<<exc.what());
+	  }catch(...){
+	    MSG(MYDEBUG,"Unknown exception !!!");
+	  }
 #endif
+	}
       } // NON STRUCTURED MESH
       else {
  	MED::PGrilleInfo aGrilleInfo = aMed->GetPGrilleInfo(aMeshInfo);