Changeset 1347 for trunk/source/persistency/gdml/src/G4GDMLRead.cc

Timestamp:

Dec 22, 2010, 3:52:27 PM (13 years ago)

Author:

garnier

Message:

geant4 tag 9.4

File:

• trunk/source/persistency/gdml/src/G4GDMLRead.cc (modified) (8 diffs)

trunk/source/persistency/gdml/src/G4GDMLRead.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4GDMLRead.cc,v 1.47 2009/05/12 15:46:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4GDMLRead.cc,v 1.50 2010/11/17 10:47:02 gcosmo Exp $
+// GEANT4 tag $Name: gdml-V09-03-09 $
 //
 // class G4GDMLRead Implementation
@@ -199 +199 @@
       const xercesc::DOMAttr* const attribute
             = dynamic_cast<xercesc::DOMAttr*>(attribute_node);   
+      if (!attribute)
+      {
+        G4Exception("G4GDMLRead::LoopRead()", "InvalidRead",
+                    FatalException, "No attribute found!");
+        return;
+      }
       const G4String attribute_name = Transcode(attribute->getName());
       const G4String attribute_value = Transcode(attribute->getValue());
@@ -266 +272 @@
 void G4GDMLRead::Read(const G4String& fileName,
                             G4bool validation,
-                            G4bool isModule)
+                            G4bool isModule,
+                            G4bool strip)
 {
    if (isModule)
@@ -305 +312 @@
      G4Exception("G4GDMLRead::Read()", "InvalidRead",
                  FatalException, error_msg);
+     return;
    }
    xercesc::DOMElement* element = doc->getDocumentElement();
@@ -312 +320 @@
      G4Exception("G4GDMLRead::Read()", "InvalidRead",
                  FatalException, "Empty document!");
+     return;
    }
 
@@ -321 +330 @@
       const xercesc::DOMElement* const child
             = dynamic_cast<xercesc::DOMElement*>(iter);
+      if (!child)
+      {
+        G4Exception("G4GDMLRead::Read()", "InvalidRead",
+                    FatalException, "No child found!");
+        return;
+      }
       const G4String tag = Transcode(child->getTagName());
 
@@ -337 +352 @@
    }
 
-   if (parser)  { delete parser;  }
-   if (handler) { delete handler; }
+   delete parser;
+   delete handler;
 
    if (isModule)
@@ -347 +362 @@
    {
       G4cout << "G4GDML: Reading '" << fileName << "' done!" << G4endl;
-      StripNames();
-   }
-}
+      if (strip)  { StripNames(); }
+   }
+}