mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-05-05 21:11:25 +00:00
Code Issues Releases Wiki Activity

Merge branch 'smartobjectnodepointer' into 'master'

Browse source 
Fix unsafe memory access at object.cpp

Closes #6680

See merge request OpenMW/openmw!1726
This commit is contained in:
elsid 2022-03-26 15:16:22 +00:00
commit c35f8c01ab
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -107,6 +107,7 @@
Bug #6606: Quests with multiple IDs cannot always be restarted Bug #6606: Quests with multiple IDs cannot always be restarted
Bug #6655: Constant effect absorb attribute causes the game to break Bug #6655: Constant effect absorb attribute causes the game to break
Bug #6670: Dialogue order is incorrect Bug #6670: Dialogue order is incorrect
Bug #6680: object.cpp handles nodetree unsafely, memory access with dangling pointer
Feature #890: OpenMW-CS: Column filtering Feature #890: OpenMW-CS: Column filtering
Feature #1465: "Reset" argument for AI functions Feature #1465: "Reset" argument for AI functions
Feature #2491: Ability to make OpenMW "portable" Feature #2491: Ability to make OpenMW "portable"

2
apps/openmw/mwrender/objects.cpp
View file

@ -164,7 +164,7 @@ void Objects::removeCell(const MWWorld::CellStore* store)
void Objects::updatePtr(const MWWorld::Ptr &old, const MWWorld::Ptr &cur) void Objects::updatePtr(const MWWorld::Ptr &old, const MWWorld::Ptr &cur)
{ {
osg::Node* objectNode = cur.getRefData().getBaseNode(); osg::ref_ptr<osg::Node> objectNode = cur.getRefData().getBaseNode();
if (!objectNode) if (!objectNode)
return; return;