mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-21 13:09:42 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2035 from akortunov/coverity

Browse source 
Fix many Coverity Scan warnings
This commit is contained in:
Bret Curtis 2018-11-14 09:44:30 +01:00 committed by GitHub
commit 419e7ea5a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 81 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/esmtool/esmtool.cpp
View file

@ -507,7 +507,7 @@ int clone(Arguments& info)
esm.endRecord(typeName.toString());
saved++;
int perc = (int)((saved / (float)recordCount)*100);
int perc = recordCount == 0 ? 100 : (int)((saved / (float)recordCount)*100);
if (perc % 10 == 0)
{
std::cerr << "\r" << perc << "%";

7
apps/mwiniimporter/importer.cpp
View file

@ -860,11 +860,12 @@ std::vector<std::string>::iterator MwIniImporter::findString(std::vector<std::st
}
void MwIniImporter::addPaths(std::vector<boost::filesystem::path>& output, std::vector<std::string> input) {
for (auto& path : input) {
for (auto& path : input)
{
if (path.front() == '"')
{
path.erase(path.begin());
path.erase(path.end() - 1);
// Drop first and last characters - quotation marks
path = path.substr(1, path.size() - 2);
}
output.emplace_back(path);
}

2
apps/opencs/model/doc/documentmanager.cpp
View file

@ -9,7 +9,7 @@
#include "document.hpp"
CSMDoc::DocumentManager::DocumentManager (const Files::ConfigurationManager& configuration)
: mConfiguration (configuration), mEncoding (ToUTF8::WINDOWS_1252)
: mConfiguration (configuration), mEncoding (ToUTF8::WINDOWS_1252), mFsStrict(false)
{
boost::filesystem::path projectPath = configuration.getUserDataPath() / "projects";

11
apps/opencs/model/prefs/shortcut.cpp
View file

@ -5,6 +5,8 @@
#include <QAction>
#include <QWidget>
#include <components/debug/debuglog.hpp>
#include "state.hpp"
#include "shortcutmanager.hpp"
@ -71,7 +73,14 @@ namespace CSMPrefs
Shortcut::~Shortcut()
{
State::get().getShortcutManager().removeShortcut(this);
try
{
State::get().getShortcutManager().removeShortcut(this);
}
catch(const std::exception& e)
{
Log(Debug::Error) << "Error in the destructor: " << e.what();
}
}
bool Shortcut::isEnabled() const

11
apps/opencs/model/world/actoradapter.cpp
View file

@ -21,6 +21,11 @@ namespace CSMWorld
return mIsBeast;
}
ActorAdapter::RaceData::RaceData()
{
mIsBeast = false;
}
bool ActorAdapter::RaceData::handlesPart(ESM::PartReferenceType type) const
{
switch (type)
@ -83,6 +88,12 @@ namespace CSMWorld
}
ActorAdapter::ActorData::ActorData()
{
mCreature = false;
mFemale = false;
}
const std::string& ActorAdapter::ActorData::getId() const
{
return mId;

4
apps/opencs/model/world/actoradapter.hpp
View file

@ -43,6 +43,8 @@ namespace CSMWorld
class RaceData
{
public:
RaceData();
/// Retrieves the id of the race represented
const std::string& getId() const;
/// Checks if it's a beast race
@ -80,6 +82,8 @@ namespace CSMWorld
class ActorData
{
public:
ActorData();
/// Retrieves the id of the actor represented
const std::string& getId() const;
/// Checks if the actor is a creature

6
apps/opencs/model/world/commands.cpp
View file

@ -198,7 +198,11 @@ CSMWorld::ModifyCommand::ModifyCommand (QAbstractItemModel& model, const QModelI
if (mIndex.parent().isValid())
{
setText ("Modify " + dynamic_cast<CSMWorld::IdTree*>(mModel)->nestedHeaderData (
CSMWorld::IdTree* tree = dynamic_cast<CSMWorld::IdTree*>(mModel);
assert(tree != nullptr);
setText ("Modify " + tree->nestedHeaderData (
mIndex.parent().column(), mIndex.column(), Qt::Horizontal, Qt::DisplayRole).toString());
}
else

13
apps/opencs/view/prefs/dialogue.cpp
View file

@ -8,6 +8,8 @@
#include <QStackedWidget>
#include <QListWidgetItem>
#include <components/debug/debuglog.hpp>
#include "../../model/prefs/state.hpp"
#include "page.hpp"
@ -77,8 +79,15 @@ CSVPrefs::Dialogue::Dialogue()
CSVPrefs::Dialogue::~Dialogue()
{
if (isVisible())
CSMPrefs::State::get().save();
try
{
if (isVisible())
CSMPrefs::State::get().save();
}
catch(const std::exception& e)
{
Log(Debug::Error) << "Error in the destructor: " << e.what();
}
}
void CSVPrefs::Dialogue::closeEvent (QCloseEvent *event)

1
apps/opencs/view/render/cameracontroller.cpp
View file

@ -463,6 +463,7 @@ namespace CSVRender
, mDistance(0)
, mOrbitSpeed(osg::PI / 4)
, mOrbitSpeedMult(4)
, mConstRoll(false)
{
CSMPrefs::Shortcut* naviPrimaryShortcut = new CSMPrefs::Shortcut("scene-navi-primary", widget);
naviPrimaryShortcut->enable(false);

8
apps/opencs/view/render/pathgrid.cpp
View file

@ -227,6 +227,8 @@ namespace CSVRender
CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
CSMWorld::UniversalId::Type_Pathgrids));
assert(model != nullptr);
const CSMWorld::Pathgrid* source = getPathgridSource();
if (source)
{
@ -360,6 +362,8 @@ namespace CSVRender
CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
CSMWorld::UniversalId::Type_Pathgrids));
assert(model != nullptr);
// Want to remove nodes from end of list first
std::sort(mSelected.begin(), mSelected.end(), std::greater<int>());
@ -461,6 +465,8 @@ namespace CSVRender
CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
CSMWorld::UniversalId::Type_Pathgrids));
assert(model != nullptr);
int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridEdges);
std::set<int, std::greater<int> >::iterator row;
@ -636,6 +642,8 @@ namespace CSVRender
CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
CSMWorld::UniversalId::Type_Pathgrids));
assert(model != nullptr);
int recordIndex = mPathgridCollection.getIndex(mId);
int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridEdges);

10
apps/opencs/view/render/scenewidget.cpp
View file

@ -13,6 +13,7 @@
#include <osg/Material>
#include <osg/Version>
#include <components/debug/debuglog.hpp>
#include <components/resource/scenemanager.hpp>
#include <components/resource/resourcesystem.hpp>
#include <components/sceneutil/lightmanager.hpp>
@ -96,7 +97,14 @@ RenderWidget::RenderWidget(QWidget *parent, Qt::WindowFlags f)
RenderWidget::~RenderWidget()
{
CompositeViewer::get().removeView(mView);
try
{
CompositeViewer::get().removeView(mView);
}
catch(const std::exception& e)
{
Log(Debug::Error) << "Error in the destructor: " << e.what();
}
}
void RenderWidget::flagAsModified()

6
apps/opencs/view/render/terraintexturemode.cpp
View file

@ -256,9 +256,9 @@ void CSVRender::TerrainTextureMode::editTerrainTextureGrid(const WorldspaceHitRe
std::string mBrushTextureInt = mBrushTexture.substr (hashlocation+1);
int brushInt = stoi(mBrushTexture.substr (hashlocation+1))+1; // All indices are offset by +1
float rf = mBrushSize/2;
int r = (mBrushSize/2)+1;
float distance = 0;
int rf = mBrushSize / 2;
int r = mBrushSize / 2 + 1;
int distance = 0;
if (mBrushShape == 0)
{

2
apps/opencs/view/world/cellcreator.cpp
View file

@ -25,7 +25,7 @@ std::string CSVWorld::CellCreator::getId() const
void CSVWorld::CellCreator::configureCreateCommand(CSMWorld::CreateCommand& command) const
{
CSMWorld::IdTree *model = dynamic_cast<CSMWorld::IdTree *>(getData().getTableModel(getCollectionId()));
Q_ASSERT(model != nullptr);
assert(model != nullptr);
int parentIndex = model->findColumnIndex(CSMWorld::Columns::ColumnId_Cell);
int index = model->findNestedColumnIndex(parentIndex, CSMWorld::Columns::ColumnId_Interior);
command.addNestedValue(parentIndex, index, mType->currentIndex() == 0);

6
apps/opencs/view/world/dialoguesubview.cpp
View file

@ -555,8 +555,10 @@ void CSVWorld::EditWidget::remake(int row)
if (mTable->hasChildren(mTable->index(row, i)) &&
!(flags & CSMWorld::ColumnBase::Flag_Dialogue_List))
{
mNestedModels.push_back(new CSMWorld::NestedTableProxyModel (
mTable->index(row, i), display, dynamic_cast<CSMWorld::IdTree*>(mTable)));
CSMWorld::IdTree *innerTable = dynamic_cast<CSMWorld::IdTree*>(mTable);
assert(innerTable != nullptr);
mNestedModels.push_back(new CSMWorld::NestedTableProxyModel (mTable->index(row, i), display, innerTable));
int idColumn = mTable->findColumnIndex (CSMWorld::Columns::ColumnId_Id);
int typeColumn = mTable->findColumnIndex (CSMWorld::Columns::ColumnId_RecordType);

7
apps/opencs/view/world/scripthighlighter.cpp
View file

@ -81,8 +81,11 @@ void CSVWorld::ScriptHighlighter::highlight (const Compiler::TokenLoc& loc, Type
CSVWorld::ScriptHighlighter::ScriptHighlighter (const CSMWorld::Data& data, Mode mode,
QTextDocument *parent)
: QSyntaxHighlighter (parent), Compiler::Parser (mErrorHandler, mContext), mContext (data),
mMode (mode)
: QSyntaxHighlighter (parent)
, Compiler::Parser (mErrorHandler, mContext)
, mContext (data)
, mMode (mode)
, mMarkOccurrences (false)
{
QColor color ("black");
QTextCharFormat format;

1
apps/openmw/mwmechanics/aiwander.cpp
View file

@ -955,6 +955,7 @@ namespace MWMechanics
, mStoredInitialActorPosition(wander->mStoredInitialActorPosition)
, mHasDestination(false)
, mDestination(osg::Vec3f(0, 0, 0))
, mUsePathgrid(false)
{
if (mStoredInitialActorPosition)
mInitialActorPosition = wander->mInitialActorPosition;

1
apps/openmw/mwsound/ffmpeg_decoder.cpp
View file

@ -431,6 +431,7 @@ size_t FFmpeg_Decoder::getSampleOffset()
FFmpeg_Decoder::FFmpeg_Decoder(const VFS::Manager* vfs)
: Sound_Decoder(vfs)
, mFormatCtx(nullptr)
, mCodecCtx(nullptr)
, mStream(nullptr)
, mFrame(nullptr)
, mFrameSize(0)

1
components/detournavigator/makenavmesh.cpp
View file

@ -129,6 +129,7 @@ namespace
config.bmin[2] -= getBorderSize(settings);
config.bmax[0] += getBorderSize(settings);
config.bmax[2] += getBorderSize(settings);
config.tileSize = settings.mTileSize;
return config;
}