Fix end-iterator dereference when pruning source-to-targets map#2656
Open
kikou wants to merge 1 commit into
Open
Fix end-iterator dereference when pruning source-to-targets map#2656kikou wants to merge 1 commit into
kikou wants to merge 1 commit into
Conversation
The empty() check and subsequent erase ran outside the find() validity guard, dereferencing end() whenever the source was not present in _sourceToTargetsMap.
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes undefined behavior in HdArnoldRenderDelegate::HasPendingChanges by ensuring _sourceToTargetsMap is only accessed/erased when the find() call actually returns a valid iterator, preventing an end() iterator dereference during dependency-pruning.
Changes:
- Move
sourceIt->second.empty()and_sourceToTargetsMap.erase(sourceIt)inside thesourceIt != _sourceToTargetsMap.end()guard. - Prevent potential crashes/UB when a dependency removal event references a source that is no longer present in
_sourceToTargetsMap.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
cpichard
approved these changes
May 22, 2026
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
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.
Summary
HdArnoldRenderDelegate::HasPendingChanges, when handling the_dependencyRemovalQueue, theempty()check and the subsequent_sourceToTargetsMap.erase(sourceIt)ran outside thesourceIt != _sourceToTargetsMap.end()guard.findreturnedend()and we then dereferenced/erased that end iterator — undefined behavior.Test plan