libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 06:08:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BLADERUNNER: Remove extra event arrays. PVS Studio V575

Browse Source 
The intent was to create a Common::Array with a maximum capacity of 20.
Instead, _activeCustomEvents was a C array of 20 Common::Arrays.
The -> operator accesses the first element of a C array, so the first
Common::Array was always used.
This commit is contained in:
sluicebox 2023-10-31 14:20:29 -07:00
parent d6acb1a143
commit 1e546bf51d
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
engines/bladerunner/bladerunner.cpp
View File

@ -247,7 +247,7 @@ BladeRunnerEngine::BladeRunnerEngine(OSystem *syst, const ADGameDescription *des
_keyRepeatTimeLast = 0;
_keyRepeatTimeDelay = 0;
_activeCustomEvents->clear();
_activeCustomEvents.clear();
_customEventRepeatTimeLast = 0;
_customEventRepeatTimeDelay = 0;
@ -1552,12 +1552,12 @@ void BladeRunnerEngine::handleEvents() {
// fall through
case kMpDeleteSelectedSvdGame:
if (isAllowedRepeatedCustomEvent(event)
&& _activeCustomEvents->size() < kMaxCustomConcurrentRepeatableEvents) {
if (_activeCustomEvents->empty()) {
&& _activeCustomEvents.size() < kMaxCustomConcurrentRepeatableEvents) {
if (_activeCustomEvents.empty()) {
_customEventRepeatTimeLast = _time->currentSystem();
_customEventRepeatTimeDelay = kKeyRepeatInitialDelay;
}
_activeCustomEvents->push_back(event);
_activeCustomEvents.push_back(event);
}
handleCustomEventStart(event);
break;
@ -1612,12 +1612,12 @@ void BladeRunnerEngine::handleEvents() {
// Some of those may lead to their own internal gameTick() loops (which will call handleEvents()).
// Thus, we need to get a new timeNow value here to ensure we're not comparing with a stale version.
uint32 timeNow = _time->currentSystem();
if (!_activeCustomEvents->empty()
if (!_activeCustomEvents.empty()
&& (timeNow - _customEventRepeatTimeLast >= _customEventRepeatTimeDelay)) {
_customEventRepeatTimeLast = timeNow;
_customEventRepeatTimeDelay = kKeyRepeatSustainDelay;
uint16 aceSize = _activeCustomEvents->size();
for (ActiveCustomEventsArray::iterator it = _activeCustomEvents->begin(); it != _activeCustomEvents->end(); it++) {
uint16 aceSize = _activeCustomEvents.size();
for (ActiveCustomEventsArray::iterator it = _activeCustomEvents.begin(); it != _activeCustomEvents.end(); it++) {
// kbdRepeat field will be unused here since we emulate the kbd repeat behavior anyway,
// but maybe it's good to set it for consistency
it->kbdRepeat = true;
@ -1630,7 +1630,7 @@ void BladeRunnerEngine::handleEvents() {
// TODO This is probably an indication that this could be reworked
// as something cleaner and safer.
// Or event repetition could be handled by the keymapper code (outside the engine code)
if (aceSize != _activeCustomEvents->size()) {
if (aceSize != _activeCustomEvents.size()) {
break;
}
}
@ -1756,18 +1756,18 @@ void BladeRunnerEngine::cleanupPendingRepeatingEvents(const Common::String &keym
if (getEventManager()->getKeymapper() != nullptr
&& getEventManager()->getKeymapper()->getKeymap(keymapperId) != nullptr
&& !_activeCustomEvents->empty()) {
&& !_activeCustomEvents.empty()) {
Common::Keymap::ActionArray actionsInKm = getEventManager()->getKeymapper()->getKeymap(keymapperId)->getActions();
for (Common::Keymap::ActionArray::iterator kmIt = actionsInKm.begin(); kmIt != actionsInKm.end(); ++kmIt) {
for (ActiveCustomEventsArray::iterator actIt = _activeCustomEvents->begin(); actIt != _activeCustomEvents->end(); ++actIt) {
for (ActiveCustomEventsArray::iterator actIt = _activeCustomEvents.begin(); actIt != _activeCustomEvents.end(); ++actIt) {
if ((actIt->type != Common::EVENT_INVALID) && (actIt->customType == (*kmIt)->event.customType)) {
_activeCustomEvents->erase(actIt);
_activeCustomEvents.erase(actIt);
// When erasing an element from an array, erase(iterator pos)
// will return an iterator pointing to the next element in the array.
// Thus, we should check if we reached the end() here, to avoid moving
// the iterator in the next loop repetition to an invalid memory location.
if (actIt == _activeCustomEvents->end()) {
if (actIt == _activeCustomEvents.end()) {
break;
}
}
@ -1777,10 +1777,10 @@ void BladeRunnerEngine::cleanupPendingRepeatingEvents(const Common::String &keym
}
void BladeRunnerEngine::handleCustomEventStop(Common::Event &event) {
if (!_activeCustomEvents->empty()) {
for (ActiveCustomEventsArray::iterator it = _activeCustomEvents->begin(); it != _activeCustomEvents->end(); it++) {
if (!_activeCustomEvents.empty()) {
for (ActiveCustomEventsArray::iterator it = _activeCustomEvents.begin(); it != _activeCustomEvents.end(); it++) {
if ((it->type != Common::EVENT_INVALID) && (it->customType == event.customType)) {
_activeCustomEvents->erase(it);
_activeCustomEvents.erase(it);
break;
}
}

2
engines/bladerunner/bladerunner.h
View File

@ -296,7 +296,7 @@ public:
// However, we should probably restrict the active events
// (that can be repeated while holding the mapped keys down)
// to a maximum of kMaxCustomConcurrentRepeatableEvents
ActiveCustomEventsArray _activeCustomEvents[kMaxCustomConcurrentRepeatableEvents];
ActiveCustomEventsArray _activeCustomEvents;
// NOTE We still need keyboard functionality for naming saved games and also for the KIA Easter eggs.
// In KIA keyboard events should be accounted where possible - however some keymaps are still needed