From b908fb8350e40883a9ec4b12be0430c79c615ca6 Mon Sep 17 00:00:00 2001 From: Andrei Gheata <Andrei.Gheata@cern.ch> Date: Fri, 8 Jun 2012 15:54:16 +0000 Subject: [PATCH] coverity fixes git-svn-id: http://root.cern.ch/svn/root/trunk@44634 27541ba8-7e3a-0410-8455-c3a389f83636 --- geom/geom/src/TGeoManager.cxx | 1 + geom/geom/src/TGeoPhysicalNode.cxx | 2 ++ 2 files changed, 3 insertions(+) diff --git a/geom/geom/src/TGeoManager.cxx b/geom/geom/src/TGeoManager.cxx index 359156ed96e..c3a67c7a54b 100644 --- a/geom/geom/src/TGeoManager.cxx +++ b/geom/geom/src/TGeoManager.cxx @@ -3632,6 +3632,7 @@ void TGeoManager::UpdateElements() for (i=0; i<nelem; i++) { elem = mix->GetElement(i); elem_table = fElementTable->GetElement(elem->Z()); + if (!elem || !elem_table) continue; if (elem != elem_table) { elem_table->SetDefined(elem->IsDefined()); elem_table->SetUsed(elem->IsUsed()); diff --git a/geom/geom/src/TGeoPhysicalNode.cxx b/geom/geom/src/TGeoPhysicalNode.cxx index eaf472ba99d..0e07ca0460b 100644 --- a/geom/geom/src/TGeoPhysicalNode.cxx +++ b/geom/geom/src/TGeoPhysicalNode.cxx @@ -177,11 +177,13 @@ void TGeoPhysicalNode::Align(TGeoMatrix *newmat, TGeoShape *newshape, Bool_t che // Clone daughter volume and node vd = node->GetVolume()->CloneVolume(); if (!vd) { + delete [] id; Fatal("Align", "Cannot clone volume %s", node->GetVolume()->GetName()); return; } nnode = node->MakeCopyNode(); if (!nnode) { + delete [] id; Fatal("Align", "Cannot make copy node for %s", node->GetName()); return; } -- GitLab