[GEN][ZH] Fix list element erasure with iterator on unrelated container in ResourceGatheringManager::findBestSupplyCenter, MilesAudioManager::killLowestPrioritySoundImmediately #631
+10
−10
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xezon
approved these changes
Apr 8, 2025
| releasePlayingAudio( playing ); | ||
| m_playing3DSounds.erase( it ); | ||
| m_playingSounds.erase( it ); |
There was a problem hiding this comment.
I am 99% sure that this just worked with no bugs with stlport's implementation.
iterator erase(iterator __position) {
_List_node_base* __next_node = __position._M_node->_M_next; // accesses next node
_List_node_base* __prev_node = __position._M_node->_M_prev; // accesses prev node
_Node* __n = (_Node*) __position._M_node; // accesses current node
__prev_node->_M_next = __next_node; // writes prev node
__next_node->_M_prev = __prev_node; // writes next node
_Destroy(&__n->_M_data); // calls destructor with the same type (PlayingAudio*)
this->_M_node.deallocate(__n, 1); // calls deallocate on default allocator for std::list
return iterator((_Node*)__next_node); // return local
}Same with m_supplyCenters.erase( iterator )
So these were no runtime issues in the retail game.
There was a problem hiding this comment.
That is funny that it essentially looks like it does not care what container it is called on, just that erase is called with an iterator.
| @@ -213,7 +213,7 @@ Object *ResourceGatheringManager::findBestSupplyCenter( Object *queryObject ) | |||
| if( dock ) | |||
| { | |||
| static const NameKeyType key_centerUpdate = NAMEKEY("SupplyCenterDockUpdate"); | |||
| SupplyWarehouseDockUpdate *centerModule = (SupplyWarehouseDockUpdate*)dock->findUpdateModule( key_centerUpdate ); | |||
| SupplyCenterDockUpdate *centerModule = (SupplyCenterDockUpdate*)dock->findUpdateModule( key_centerUpdate ); | |||
There was a problem hiding this comment.
This certainly was no runtime bug, because this pointer is just tested for null.
| @@ -146,7 +146,7 @@ void SubsystemInterfaceList::addSubsystem(SubsystemInterface* sys) | |||
| void SubsystemInterfaceList::removeSubsystem(SubsystemInterface* sys) | |||
| { | |||
| #ifdef DUMP_PERF_STATS | |||
| for (SubsystemList::iterator it = m_allSubsystems.begin(); it != m_subsystems.end(); ++it) | |||
| for (SubsystemList::iterator it = m_allSubsystems.begin(); it != m_allSubsystems.end(); ++it) | |||
There was a problem hiding this comment.
This is a debug bug fix. No concern for retail game.
xezon
added
Minor
xezon
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Within some iterator use, likely due to copy and paste errors, there are iterators being used on the wrong container.
In the short term this can cause memory leaks as the required data is never freed from the container.
This can also cause unexpected behaviour as the container is growing with data that should have been removed.
There is also a bug fix for a cast that was setting the wrong type on a pointer, this does not seem to affect runtime but could be an issue in the future.