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

Merge branch 'coverity' into 'master'

Browse source 
Coverity fixes

See merge request OpenMW/openmw!2125
This commit is contained in:
psi29a 2022-07-12 12:59:00 +00:00
commit a8ec69045c
2 changed files with 5 additions and 3 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);

5
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);
@ -319,7 +320,7 @@ void CSMWorld::InfoCollection::removeRows (int index, int count)
++it; ++it;
} }
else else
iter->second.erase(it); it = iter->second.erase(it);
} }
else else
++it; ++it;