don't overflow when relations are empty #18891
Merged
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
mockersf
added
C-Bug
databasedav
approved these changes
Apr 21, 2025
mgi388
reviewed
Apr 21, 2025
| @@ -213,15 +213,15 @@ impl OrderedRelationshipSourceCollection for Vec<Entity> { | |||
|
|
|||
| fn place_most_recent(&mut self, index: usize) { | |||
| if let Some(entity) = self.pop() { | |||
| let index = index.min(self.len() - 1); | |||
| let index = index.min(self.len().saturating_sub(1)); | |||
| self.insert(index, entity); | |||
| } | |||
| } | |||
|
|
|||
| fn place(&mut self, entity: Entity, index: usize) { | |||
| if let Some(current) = <[Entity]>::iter(self).position(|e| *e == entity) { | |||
| // The len is at least 1, so the subtraction is safe. | |||
There was a problem hiding this comment.
This comment suggests the - 1 should always be safe, so does it indicate something else wrong?
Noting that I approve of the change to saturating_sub generally.
There was a problem hiding this comment.
This line here IMO cannot fail, as the position call cannot return Some if there are no items to filter.
The bugfix is thus in the other line that was changed.
There was a problem hiding this comment.
Ah ok that makes sense. This line was just changed while he was here.
janhohenheim
added
the
S-Ready-For-Final-Review
mockersf
added a commit
that referenced
this pull request
Apr 21, 2025
# Objective - Fixes #18890 ## Solution - Don't overflow when substracting, bound at 0 ## Testing - Reproducer from the issue now works
splo
pushed a commit
to splo/bevy
that referenced
this pull request
Apr 29, 2025
# Objective - Fixes bevyengine#18890 ## Solution - Don't overflow when substracting, bound at 0 ## Testing - Reproducer from the issue now works
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.
Objective
EntityWorldMut::insert_childrenpanics on index 0 #18890Solution
Testing