Changeset 1347 for trunk/source/persistency/gdml/src/G4GDMLReadDefine.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/G4GDMLReadDefine.cc (modified) (13 diffs)

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4GDMLReadDefine.cc,v 1.25 2010/02/17 18:06:25 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4GDMLReadDefine.cc,v 1.26 2010/10/14 16:19:40 gcosmo Exp $
+// GEANT4 tag $Name: gdml-V09-03-09 $
 //
 // class G4GDMLReadDefine Implementation
@@ -42 +42 @@
 G4GDMLMatrix::G4GDMLMatrix(size_t rows0, size_t cols0)
 {   
-   if ((rows<=0) || (cols<=0))
+   if ((rows0==0) || (cols0==0))
    {
      G4Exception("G4GDMLMatrix::G4GDMLMatrix(r,c)", "InvalidSetup",
@@ -161 +161 @@
       const xercesc::DOMAttr* const attribute
             = dynamic_cast<xercesc::DOMAttr*>(node);   
+      if (!attribute)
+      {
+        G4Exception("G4GDMLRead::ConstantRead()", "InvalidRead",
+                    FatalException, "No attribute found!");
+        return;
+      }
       const G4String attName = Transcode(attribute->getName());
       const G4String attValue = Transcode(attribute->getValue());
@@ -190 +196 @@
       const xercesc::DOMAttr* const attribute
             = dynamic_cast<xercesc::DOMAttr*>(node);   
+      if (!attribute)
+      {
+        G4Exception("G4GDMLRead::ExpressionRead()", "InvalidRead",
+                    FatalException, "No attribute found!");
+        return;
+      }
       const G4String attName = Transcode(attribute->getName());
       const G4String attValue = Transcode(attribute->getValue());
@@ -221 +233 @@
       const xercesc::DOMAttr* const attribute
             = dynamic_cast<xercesc::DOMAttr*>(node);   
+      if (!attribute)
+      {
+        G4Exception("G4GDMLRead::MatrixRead()", "InvalidRead",
+                    FatalException, "No attribute found!");
+        return;
+      }
       const G4String attName = Transcode(attribute->getName());
       const G4String attValue = Transcode(attribute->getValue());
@@ -271 +289 @@
       const xercesc::DOMAttr* const attribute
             = dynamic_cast<xercesc::DOMAttr*>(node);   
+      if (!attribute)
+      {
+        G4Exception("G4GDMLRead::PositionRead()", "InvalidRead",
+                    FatalException, "No attribute found!");
+        return;
+      }
       const G4String attName = Transcode(attribute->getName());
       const G4String attValue = Transcode(attribute->getValue());
@@ -304 +328 @@
       const xercesc::DOMAttr* const attribute
             = dynamic_cast<xercesc::DOMAttr*>(node);   
+      if (!attribute)
+      {
+        G4Exception("G4GDMLRead::RotationRead()", "InvalidRead",
+                    FatalException, "No attribute found!");
+        return;
+      }
       const G4String attName = Transcode(attribute->getName());
       const G4String attValue = Transcode(attribute->getValue());
@@ -335 +365 @@
       const xercesc::DOMAttr* const attribute
             = dynamic_cast<xercesc::DOMAttr*>(node);   
+      if (!attribute)
+      {
+        G4Exception("G4GDMLRead::ScaleRead()", "InvalidRead",
+                    FatalException, "No attribute found!");
+        return;
+      }
       const G4String attName = Transcode(attribute->getName());
       const G4String attValue = Transcode(attribute->getValue());
@@ -366 +402 @@
       const xercesc::DOMAttr* const attribute
             = dynamic_cast<xercesc::DOMAttr*>(node);   
+      if (!attribute)
+      {
+        G4Exception("G4GDMLRead::VariableRead()", "InvalidRead",
+                    FatalException, "No attribute found!");
+        return;
+      }
       const G4String attName = Transcode(attribute->getName());
       const G4String attValue = Transcode(attribute->getValue());
@@ -395 +437 @@
       const xercesc::DOMAttr* const attribute
             = dynamic_cast<xercesc::DOMAttr*>(node);   
+      if (!attribute)
+      {
+        G4Exception("G4GDMLRead::QuantityRead()", "InvalidRead",
+                    FatalException, "No attribute found!");
+        return;
+      }
       const G4String attName = Transcode(attribute->getName());
       const G4String attValue = Transcode(attribute->getValue());
@@ -419 +467 @@
       const xercesc::DOMElement* const child
             = dynamic_cast<xercesc::DOMElement*>(iter);
+      if (!child)
+      {
+        G4Exception("G4GDMLRead::DefineRead()", "InvalidRead",
+                    FatalException, "No child found!");
+        return;
+      }
       const G4String tag = Transcode(child->getTagName());
 
@@ -458 +512 @@
       const xercesc::DOMAttr* const attribute
             = dynamic_cast<xercesc::DOMAttr*>(attribute_node);   
+      if (!attribute)
+      {
+        G4Exception("G4GDMLRead::VectorRead()", "InvalidRead",
+                    FatalException, "No attribute found!");
+        return;
+      }
       const G4String attName = Transcode(attribute->getName());
       const G4String attValue = Transcode(attribute->getValue());
@@ -487 +547 @@
       const xercesc::DOMAttr* const attribute
             = dynamic_cast<xercesc::DOMAttr*>(attribute_node);   
+      if (!attribute)
+      {
+        G4Exception("G4GDMLRead::Read()", "InvalidRead",
+                    FatalException, "No attribute found!");
+        return ref;
+      }
       const G4String attName = Transcode(attribute->getName());
       const G4String attValue = Transcode(attribute->getValue());