Check if Solid is valid before getting its name to avoid segfault

cms-sw · Dec 13, 2019 · 3f87ce2 · 3f87ce2
1 parent 7f30694
commit 3f87ce2
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/DetectorDescription/DDCMS/src/DDNamespace.cc b/DetectorDescription/DDCMS/src/DDNamespace.cc
@@ -153,11 +153,14 @@ dd4hep::Volume DDNamespace::addVolumeNS(dd4hep::Volume vol) const {
   dd4hep::Material m = vol.material();
   vol->SetName(n.c_str());
   m_context->volumes[n] = vol;
+  const char* solidName = "Invalid solid";
+  if (s.isValid())         // Protect against seg fault
+    solidName = s.name();  // If Solid is not valid, s.name() will seg fault.
   dd4hep::printout(m_context->debug_volumes ? dd4hep::ALWAYS : dd4hep::DEBUG,
                    "DD4CMS",
-                   "+++ Add volume:%-38s Solid:%-26s[%-16s] Material:%s",
+                   "+++ Add volumeNS:%-38s Solid:%-26s[%-16s] Material:%s",
                    vol.name(),
-                   s.name(),
+                   solidName,
                    s.type(),
                    m.name());
   return vol;
@@ -170,12 +173,15 @@ dd4hep::Volume DDNamespace::addVolume(dd4hep::Volume vol) const {
   dd4hep::Material m = vol.material();
   //vol->SetName(n.c_str());
   m_context->volumes[n] = vol;
+  const char* solidName = "Invalid solid";
+  if (s.isValid())         // Protect against seg fault
+    solidName = s.name();  // If Solid is not valid, s.name() will seg fault.
   dd4hep::printout(m_context->debug_volumes ? dd4hep::ALWAYS : dd4hep::DEBUG,
                    "DD4CMS",
                    "+++ Add volume:%-38s as [%s] Solid:%-26s[%-16s] Material:%s",
                    vol.name(),
                    n.c_str(),
-                   s.name(),
+                   solidName,
                    s.type(),
                    m.name());
   return vol;