forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't overflow when relations are empty (#18891)

Browse Source 
# Objective

- Fixes #18890 

## Solution

- Don't overflow when substracting, bound at 0

## Testing

- Reproducer from the issue now works
This commit is contained in:
François Mockers 2025-04-21 22:38:43 +02:00 committed by François Mockers
parent 608f902d1a
commit 5775f431f0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/bevy_ecs/src/relationship/relationship_source_collection.rs
View File

@ -213,7 +213,7 @@ impl OrderedRelationshipSourceCollection for Vec<Entity> {
fn place_most_recent(&mut self, index: usize) { fn place_most_recent(&mut self, index: usize) {
if let Some(entity) = self.pop() { 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); self.insert(index, entity);
} }
} }
@ -221,7 +221,7 @@ impl OrderedRelationshipSourceCollection for Vec<Entity> {
fn place(&mut self, entity: Entity, index: usize) { fn place(&mut self, entity: Entity, index: usize) {
if let Some(current) = <[Entity]>::iter(self).position(|e| *e == entity) { if let Some(current) = <[Entity]>::iter(self).position(|e| *e == entity) {
// The len is at least 1, so the subtraction is safe. // The len is at least 1, so the subtraction is safe.
let index = index.min(self.len() - 1); let index = index.min(self.len().saturating_sub(1));
Vec::remove(self, current); Vec::remove(self, current);
self.insert(index, entity); self.insert(index, entity);
}; };