Application Framework - Early-return null NamedShape when TNaming_UsedShapes is missi...

Check Acces.Root().FindAttribute(...) result in TNaming_Tool::NamedShape and return an empty Handle
if the TNaming_UsedShapes attribute is not found to avoid using an uninitialized map.

diff --git a/src/TNaming/TNaming_NamedShape.cxx b/src/TNaming/TNaming_NamedShape.cxx
index cb9b35283db4c6c4af9dd059dbda9a8bed8b9b34..684fe907c81af3aa0b9e6817738e1209ef47b7db 100644 (file)
--- a/src/TNaming/TNaming_NamedShape.cxx
+++ b/src/TNaming/TNaming_NamedShape.cxx
@@ -1429,9 +1429,12 @@ TDF_Label TNaming_Tool::Label(const Handle(TNaming_UsedShapes)& Shapes,
 
 Handle(TNaming_NamedShape) TNaming_Tool::NamedShape(const TopoDS_Shape& S, const TDF_Label& Acces)
 {
-  Handle(TNaming_UsedShapes) US;
-  Acces.Root().FindAttribute(TNaming_UsedShapes::GetID(), US);
   Handle(TNaming_NamedShape) NS;
+  Handle(TNaming_UsedShapes) US;
+  if (!Acces.Root().FindAttribute(TNaming_UsedShapes::GetID(), US))
+  {
+    return NS;
+  }
 
   if (!TNaming_Tool::HasLabel(US, S))
   {