OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0026324: Visualization - fix iteration through corrupted memory in AIS_LocalContext::FindSelectedOwnerFromShape

Browse Source 
The signature of SelectMgr_ViewerSelector::ActiveOwners is changed to return output parameter to avoid crash
This commit is contained in:
vpa 2015-06-08 17:52:17 +03:00 committed by bugmaster
parent c3ec36b69f
commit 751955d4d7
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/AIS/AIS_LocalContext_1.cxx
View File

@ -1454,8 +1454,10 @@ Handle(SelectMgr_EntityOwner) AIS_LocalContext::FindSelectedOwnerFromShape(const
Standard_Boolean found(Standard_False); Standard_Boolean found(Standard_False);
if (!found) { if (!found) {
NCollection_List<Handle(SelectBasics_EntityOwner)>::Iterator anOwnersIt (myMainVS->ActiveOwners()); NCollection_List<Handle(SelectBasics_EntityOwner)> anActiveOwners;
for (; anOwnersIt.More(); anOwnersIt.Next()) { myMainVS->ActiveOwners (anActiveOwners);
for (NCollection_List<Handle(SelectBasics_EntityOwner)>::Iterator anOwnersIt (anActiveOwners); anOwnersIt.More(); anOwnersIt.Next())
{
EO = Handle(SelectMgr_EntityOwner)::DownCast (anOwnersIt.Value()); EO = Handle(SelectMgr_EntityOwner)::DownCast (anOwnersIt.Value());
Handle(StdSelect_BRepOwner) BROwnr = Handle(StdSelect_BRepOwner)::DownCast(EO); Handle(StdSelect_BRepOwner) BROwnr = Handle(StdSelect_BRepOwner)::DownCast(EO);
if (!BROwnr.IsNull() && BROwnr->HasShape() && BROwnr->Shape() == sh) { if (!BROwnr.IsNull() && BROwnr->HasShape() && BROwnr->Shape() == sh) {

7
src/SelectMgr/SelectMgr_ViewerSelector.cxx
View File

@ -839,9 +839,8 @@ const Handle(SelectBasics_SensitiveEntity)& SelectMgr_ViewerSelector::DetectedEn
// function : ActiveOwners // function : ActiveOwners
// purpose : Returns the list of active entity owners // purpose : Returns the list of active entity owners
//======================================================================= //=======================================================================
NCollection_List<Handle(SelectBasics_EntityOwner)> SelectMgr_ViewerSelector::ActiveOwners() const void SelectMgr_ViewerSelector::ActiveOwners (NCollection_List<Handle(SelectBasics_EntityOwner)>& theOwners) const
{ {
NCollection_List<Handle(SelectBasics_EntityOwner)> anActiveOwners;
for (SelectMgr_MapOfObjectSensitivesIterator anIter (myMapOfObjectSensitives); anIter.More(); anIter.Next()) for (SelectMgr_MapOfObjectSensitivesIterator anIter (myMapOfObjectSensitives); anIter.More(); anIter.Next())
{ {
const NCollection_Handle<SelectMgr_SensitiveEntitySet>& anEntitySet = anIter.Value(); const NCollection_Handle<SelectMgr_SensitiveEntitySet>& anEntitySet = anIter.Value();
@ -850,10 +849,8 @@ NCollection_List<Handle(SelectBasics_EntityOwner)> SelectMgr_ViewerSelector::Act
{ {
if (anEntitySet->GetSensitiveById (anIdx)->IsActiveForSelection()) if (anEntitySet->GetSensitiveById (anIdx)->IsActiveForSelection())
{ {
anActiveOwners.Append (anEntitySet->GetSensitiveById (anIdx)->BaseSensitive()->OwnerId()); theOwners.Append (anEntitySet->GetSensitiveById (anIdx)->BaseSensitive()->OwnerId());
} }
} }
} }
return anActiveOwners;
} }

2
src/SelectMgr/SelectMgr_ViewerSelector.hxx
View File

@ -203,7 +203,7 @@ public:
Standard_EXPORT TCollection_AsciiString Status (const Handle(SelectMgr_SelectableObject)& theSelectableObject) const; Standard_EXPORT TCollection_AsciiString Status (const Handle(SelectMgr_SelectableObject)& theSelectableObject) const;
//! Returns the list of active entity owners //! Returns the list of active entity owners
Standard_EXPORT NCollection_List<Handle(SelectBasics_EntityOwner)> ActiveOwners() const; Standard_EXPORT void ActiveOwners (NCollection_List<Handle(SelectBasics_EntityOwner)>& theOwners) const;
//! Adds new object to the map of selectable objects //! Adds new object to the map of selectable objects
Standard_EXPORT void AddSelectableObject (const Handle(SelectMgr_SelectableObject)& theObject); Standard_EXPORT void AddSelectableObject (const Handle(SelectMgr_SelectableObject)& theObject);