[Scummvm-git-logs] scummvm master -> 52df57691a8b620927e281fa906017c5fd534ac7
sluicebox
noreply at scummvm.org
Thu Mar 21 00:33:02 UTC 2024
This automated email contains information about 7 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
de6c73a2ee BURIED: Remove delete nullptr. PVS-Studio V575
19ba917d5a CGE: Remove delete nullptr. PVS-Studio V575
969cb1e426 HDB: Remove delete nullptr. PVS-Studio V575
98db6aa402 KYRA: Remove delete nullptr. PVS-Studio V575
754632401f PINK: Remove delete nullptr. PVS-Studio V575
a74857e957 PRINCE: Remove delete nullptr. PVS-Studio V575
52df57691a SLUDGE: Remove delete nullptr. PVS-Studio V575
Commit: de6c73a2eeb9c2dcb48be08012182753c1f8a007
https://github.com/scummvm/scummvm/commit/de6c73a2eeb9c2dcb48be08012182753c1f8a007
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-03-20T17:24:33-07:00
Commit Message:
BURIED: Remove delete nullptr. PVS-Studio V575
Changed paths:
engines/buried/scene_view.cpp
diff --git a/engines/buried/scene_view.cpp b/engines/buried/scene_view.cpp
index 984acef979e..07eefab152f 100644
--- a/engines/buried/scene_view.cpp
+++ b/engines/buried/scene_view.cpp
@@ -2164,8 +2164,6 @@ bool SceneViewWindow::checkForAIComment(const Location &commentLocation, int com
bool SceneViewWindow::infoWindowDisplayed(bool flag) {
if (flag && !_walkMovie) {
- delete _walkMovie;
- _walkMovie = nullptr;
_walkMovieFileName.clear();
changeCycleFrameMovie();
}
@@ -2186,8 +2184,6 @@ bool SceneViewWindow::infoWindowDisplayed(bool flag) {
bool SceneViewWindow::bioChipWindowDisplayed(bool flag) {
if (flag && !_walkMovie) {
- delete _walkMovie;
- _walkMovie = nullptr;
_walkMovieFileName.clear();
changeCycleFrameMovie();
}
@@ -2208,8 +2204,6 @@ bool SceneViewWindow::bioChipWindowDisplayed(bool flag) {
bool SceneViewWindow::burnedLetterWindowDisplayed(bool flag) {
if (flag && !_walkMovie) {
- delete _walkMovie;
- _walkMovie = nullptr;
_walkMovieFileName.clear();
changeCycleFrameMovie();
}
Commit: 19ba917d5aff05ee642dcb4113d335b5418915e0
https://github.com/scummvm/scummvm/commit/19ba917d5aff05ee642dcb4113d335b5418915e0
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-03-20T17:24:33-07:00
Commit Message:
CGE: Remove delete nullptr. PVS-Studio V575
Changed paths:
engines/cge/vmenu.cpp
diff --git a/engines/cge/vmenu.cpp b/engines/cge/vmenu.cpp
index df5d01defce..8fbc30d6d0e 100644
--- a/engines/cge/vmenu.cpp
+++ b/engines/cge/vmenu.cpp
@@ -66,7 +66,6 @@ Vmenu::Vmenu(CGEEngine *vm, Choice *list, int x, int y)
Choice *cp;
_addr = this;
- delete[] _vmgt;
_items = 0;
for (cp = list; cp->_text; cp++)
_items++;
Commit: 969cb1e426a358a3f72981686cbd19a44a5bacea
https://github.com/scummvm/scummvm/commit/969cb1e426a358a3f72981686cbd19a44a5bacea
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-03-20T17:24:33-07:00
Commit Message:
HDB: Remove delete nullptr. PVS-Studio V575
Changed paths:
engines/hdb/lua-script.cpp
engines/hdb/map.cpp
diff --git a/engines/hdb/lua-script.cpp b/engines/hdb/lua-script.cpp
index 326ace40c22..b093a0645e7 100644
--- a/engines/hdb/lua-script.cpp
+++ b/engines/hdb/lua-script.cpp
@@ -146,7 +146,6 @@ bool LuaScript::loadLua(const char *name) {
_systemInit = false;
- delete luaStream;
return false;
}
diff --git a/engines/hdb/map.cpp b/engines/hdb/map.cpp
index d9e5adffa10..83ce9945698 100644
--- a/engines/hdb/map.cpp
+++ b/engines/hdb/map.cpp
@@ -295,7 +295,6 @@ bool Map::loadMap(char *name) {
Common::SeekableReadStream *mapStream = g_hdb->_fileMan->findFirstData(name, TYPE_BINARY);
if (mapStream == nullptr) {
warning("The %s MPC entry can't be found", name);
- delete mapStream;
return false;
}
Commit: 98db6aa4024ecb95826e62e49b85dd14bb564807
https://github.com/scummvm/scummvm/commit/98db6aa4024ecb95826e62e49b85dd14bb564807
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-03-20T17:26:47-07:00
Commit Message:
KYRA: Remove delete nullptr. PVS-Studio V575
`releaseShpArr` deletes the pointer and sets it to nullptr
Changed paths:
engines/kyra/engine/eobcommon.cpp
diff --git a/engines/kyra/engine/eobcommon.cpp b/engines/kyra/engine/eobcommon.cpp
index 0fdb59bfa13..8e786e90d12 100644
--- a/engines/kyra/engine/eobcommon.cpp
+++ b/engines/kyra/engine/eobcommon.cpp
@@ -967,9 +967,6 @@ void EoBCoreEngine::releaseItemsAndDecorationsShapes() {
releaseShpArr(_largeItemShapesScl[i], _numLargeItemShapes);
releaseShpArr(_smallItemShapesScl[i], _numSmallItemShapes);
releaseShpArr(_thrownItemShapesScl[i], _numThrownItemShapes);
- delete[] _largeItemShapesScl[i];
- delete[] _smallItemShapesScl[i];
- delete[] _thrownItemShapesScl[i];
}
}
Commit: 754632401f3a06b38fb2616228fa8e33e86c0a8b
https://github.com/scummvm/scummvm/commit/754632401f3a06b38fb2616228fa8e33e86c0a8b
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-03-20T17:31:03-07:00
Commit Message:
PINK: Remove delete nullptr. PVS-Studio V575
Changed paths:
engines/pink/pda_mgr.cpp
diff --git a/engines/pink/pda_mgr.cpp b/engines/pink/pda_mgr.cpp
index 1161052e107..eb55f6ab518 100644
--- a/engines/pink/pda_mgr.cpp
+++ b/engines/pink/pda_mgr.cpp
@@ -181,11 +181,9 @@ void PDAMgr::close() {
}
void PDAMgr::loadGlobal() {
- if (_globalPage)
- return;
-
- delete _globalPage;
- _globalPage = new PDAPage("GLOBAL", getGame());
+ if (_globalPage == nullptr) {
+ _globalPage = new PDAPage("GLOBAL", getGame());
+ }
}
void PDAMgr::initPerilButtons() {
Commit: a74857e9574a3f1e4bc5d0221c56dc22a84724b4
https://github.com/scummvm/scummvm/commit/a74857e9574a3f1e4bc5d0221c56dc22a84724b4
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-03-20T17:31:03-07:00
Commit Message:
PRINCE: Remove delete nullptr. PVS-Studio V575
Changed paths:
engines/prince/resource.cpp
engines/prince/script.cpp
engines/prince/sound.cpp
diff --git a/engines/prince/resource.cpp b/engines/prince/resource.cpp
index a71dc2c3a2b..6d3aeb58e34 100644
--- a/engines/prince/resource.cpp
+++ b/engines/prince/resource.cpp
@@ -227,7 +227,6 @@ bool PrinceEngine::loadAnim(uint16 animNr, bool loop) {
bool PrinceEngine::loadZoom(byte *zoomBitmap, uint32 dataSize, const char *resourceName) {
Common::SeekableReadStream *stream = SearchMan.createReadStreamForMember(resourceName);
if (!stream) {
- delete stream;
return false;
}
stream = Resource::getDecompressedStream(stream);
@@ -244,7 +243,6 @@ bool PrinceEngine::loadZoom(byte *zoomBitmap, uint32 dataSize, const char *resou
bool PrinceEngine::loadShadow(byte *shadowBitmap, uint32 dataSize, const char *resourceName1, const char *resourceName2) {
Common::SeekableReadStream *stream = SearchMan.createReadStreamForMember(resourceName1);
if (!stream) {
- delete stream;
return false;
}
@@ -259,7 +257,6 @@ bool PrinceEngine::loadShadow(byte *shadowBitmap, uint32 dataSize, const char *r
Common::SeekableReadStream *stream2 = SearchMan.createReadStreamForMember(resourceName2);
if (!stream2) {
delete stream;
- delete stream2;
return false;
}
@@ -281,7 +278,6 @@ bool PrinceEngine::loadShadow(byte *shadowBitmap, uint32 dataSize, const char *r
bool PrinceEngine::loadTrans(byte *transTable, const char *resourceName) {
Common::SeekableReadStream *stream = SearchMan.createReadStreamForMember(resourceName);
if (!stream) {
- delete stream;
for (int i = 0; i < 256; i++) {
for (int j = 0; j < 256; j++) {
transTable[i * 256 + j] = j;
@@ -303,7 +299,6 @@ bool PrinceEngine::loadTrans(byte *transTable, const char *resourceName) {
bool PrinceEngine::loadPath(const char *resourceName) {
Common::SeekableReadStream *stream = SearchMan.createReadStreamForMember(resourceName);
if (!stream) {
- delete stream;
return false;
}
@@ -324,7 +319,6 @@ bool PrinceEngine::loadAllInv() {
const Common::Path invStreamName(Common::String::format("INV%02d", i));
Common::SeekableReadStream *invStream = SearchMan.createReadStreamForMember(invStreamName);
if (!invStream) {
- delete invStream;
return true;
}
@@ -351,7 +345,6 @@ bool PrinceEngine::loadAllInv() {
bool PrinceEngine::loadMobPriority(const char *resourceName) {
Common::SeekableReadStream *stream = SearchMan.createReadStreamForMember(resourceName);
if (!stream) {
- delete stream;
return false;
}
diff --git a/engines/prince/script.cpp b/engines/prince/script.cpp
index cadaf74557a..935f3b58f97 100644
--- a/engines/prince/script.cpp
+++ b/engines/prince/script.cpp
@@ -388,7 +388,6 @@ bool Script::loadAllMasks(Common::Array<Mask> &maskList, int offset) {
tempMask._height = 0;
tempMask._data = nullptr;
warning("loadAllMasks: Can't load %s", msStreamName.toString().c_str());
- delete msStream;
} else {
msStream = Resource::getDecompressedStream(msStream);
diff --git a/engines/prince/sound.cpp b/engines/prince/sound.cpp
index c47d178469c..19fe48ab7d0 100644
--- a/engines/prince/sound.cpp
+++ b/engines/prince/sound.cpp
@@ -81,7 +81,6 @@ bool PrinceEngine::loadSample(uint32 sampleSlot, const Common::String &streamNam
freeSample(sampleSlot);
Common::SeekableReadStream *sampleStream = SearchMan.createReadStreamForMember(Common::Path(normalizedPath));
if (sampleStream == nullptr) {
- delete sampleStream;
error("Can't load sample %s to slot %d", normalizedPath.c_str(), sampleSlot);
}
_audioStream[sampleSlot] = Audio::makeWAVStream(sampleStream->readStream(sampleStream->size()), DisposeAfterUse::YES);
Commit: 52df57691a8b620927e281fa906017c5fd534ac7
https://github.com/scummvm/scummvm/commit/52df57691a8b620927e281fa906017c5fd534ac7
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-03-20T17:31:03-07:00
Commit Message:
SLUDGE: Remove delete nullptr. PVS-Studio V575
Changed paths:
engines/sludge/sound.cpp
diff --git a/engines/sludge/sound.cpp b/engines/sludge/sound.cpp
index 8760dcaf8c8..f46e0ce019e 100644
--- a/engines/sludge/sound.cpp
+++ b/engines/sludge/sound.cpp
@@ -338,7 +338,6 @@ int SoundManager::makeSoundAudioStream(int f, Audio::AudioStream *&audiostream,
if (!stream) {
warning("SoundManager::makeSoundAudioStream(): Unsupported sound format %s", tag2str(tag));
- delete stream;
}
g_sludge->_resMan->finishAccess();
More information about the Scummvm-git-logs
mailing list