From a624ea564afba5a8f67599b228cb0f955e6840aa Mon Sep 17 00:00:00 2001 From: Pasukhin Dmitry Date: Fri, 24 Oct 2025 09:11:48 +0100 Subject: [PATCH] Application Framework - Early-return null NamedShape when TNaming_UsedShapes is missing (#760) 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. --- src/TNaming/TNaming_NamedShape.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/TNaming/TNaming_NamedShape.cxx b/src/TNaming/TNaming_NamedShape.cxx index cb9b35283d..684fe907c8 100644 --- 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)) { -- 2.39.5