mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-18 23:36:45 +00:00
Code Issues Releases Wiki Activity

Avoid possible null dereference

Browse source
This commit is contained in:
Andrei Kortunov 2022-07-12 12:56:53 +04:00
parent 42b9a6daaf
commit a5b0ef0912
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/opencs/model/world/collection.hpp
View file

@ -230,7 +230,8 @@ namespace CSMWorld
for (int i=0; i<size; ++i) for (int i=0; i<size; ++i)
{ {
buffer[newOrder[i]] = std::move(mRecords [baseIndex+i]); buffer[newOrder[i]] = std::move(mRecords [baseIndex+i]);
buffer[newOrder[i]]->setModified (buffer[newOrder[i]]->get()); if (buffer[newOrder[i]])
buffer[newOrder[i]]->setModified (buffer[newOrder[i]]->get());
} }
std::move (buffer.begin(), buffer.end(), mRecords.begin()+baseIndex); std::move (buffer.begin(), buffer.end(), mRecords.begin()+baseIndex);

3
apps/opencs/model/world/infocollection.cpp
View file

@ -58,7 +58,8 @@ namespace CSMWorld
for (int i = 0; i < size; ++i) for (int i = 0; i < size; ++i)
{ {
buffer[newOrder[i]] = std::move(mRecords[baseIndex+i]); buffer[newOrder[i]] = std::move(mRecords[baseIndex+i]);
buffer[newOrder[i]]->setModified(buffer[newOrder[i]]->get()); if (buffer[newOrder[i]])
buffer[newOrder[i]]->setModified(buffer[newOrder[i]]->get());
} }
std::move(buffer.begin(), buffer.end(), mRecords.begin()+baseIndex); std::move(buffer.begin(), buffer.end(), mRecords.begin()+baseIndex);