Import Geant4 10.7.0.beta source tree

source/persistency/ascii/src/G4tgbGeometryDumper.cc

@@ -707,7 +707,11 @@ void G4tgbGeometryDumper::DumpBooleanVolume( const G4String& solidType,
   if( displaced )
   {
     solid1Disp = dynamic_cast<G4DisplacedSolid*>(solid1);
-    if (solid1Disp)  { solid1 = solid1Disp->GetConstituentMovedSolid(); }
+    if (solid1Disp)  {
+      solid1 = solid1Disp->GetConstituentMovedSolid();
+    } else {
+      return;
+    }
   }
   DumpSolid( solid0 );
   DumpSolid( solid1 );
@@ -1353,15 +1357,16 @@ G4tgbGeometryDumper::Same2G4Isotopes( G4Isotope* isot1, G4Isotope* isot2 )
 const G4String& G4tgbGeometryDumper::FindSolidName( G4VSolid* solid )
 {
   std::map<G4String,G4VSolid*>::const_iterator ite;
-  for( ite = theSolids.begin(); ite != theSolids.end(); ite++ )
-  {
-    if( solid == (*ite).second )  { return (*ite).first; }
-  }
-
+  for( ite = theSolids.begin(); ite != theSolids.end(); ++ite )
+    {
+      if( solid == (*ite).second )  { return (*ite).first;
+      }
+    }
+  
   if( ite == theSolids.end() )
-  {
-    G4Exception("G4tgbGeometryDumper::FindSolidName()", "ReadError",
-                FatalException, "Programming error.");
-  }
+    {
+      G4Exception("G4tgbGeometryDumper::FindSolidName()", "ReadError",
+		  FatalException, "Programming error.");
+    }
   return (*ite).first;
 }

source/persistency/ascii/src/G4tgbVolume.cc

@@ -140,6 +140,7 @@ void G4tgbVolume::ConstructG4Volumes( const G4tgrPlace* place,
   G4tgbVolumeMgr* g4vmgr = G4tgbVolumeMgr::GetInstance();
   G4LogicalVolume* logvol = g4vmgr->FindG4LogVol( GetName() );
   G4bool bFirstCopy = false;
+  G4VPhysicalVolume* physvol = 0;
   if( logvol == 0 ) 
   {
     bFirstCopy = true;
@@ -159,9 +160,10 @@ void G4tgbVolume::ConstructG4Volumes( const G4tgrPlace* place,
     {
       return;
     }
-  } 
+  }
   //--- Construct PhysVol
-  G4VPhysicalVolume* physvol = ConstructG4PhysVol( place, logvol, parentLV );
+  physvol = ConstructG4PhysVol( place, logvol, parentLV );
+
   if( physvol != 0 )  // 0 for G4AssemblyVolumes
   {
     g4vmgr->RegisterMe( physvol );

source/persistency/ascii/src/G4tgbVolumeMgr.cc

@@ -168,8 +168,10 @@ G4tgbVolume* G4tgbVolumeMgr::FindVolume( const G4String& volname)
     G4String ErrMessage = "G4tgbVolume not found: " + volname + " !";
     G4Exception("G4tgbVolumeMgr::FindVolume()", "InvalidSetup",
                 FatalException, ErrMessage);
+    return (G4tgbVolume*)0;
+  } else {
+    return (*cite).second;
   }
-  return (*cite).second;
 }