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

Prevent last_trigger_id from overflowing (#17978)

Browse Source 
# Objective

This prevents overflowing the `last_trigger_id` property that leads to a
panic in debug mode.

```bash
panicked at C:\XXX\.cargo\registry\src\index.crates.io-6f17d22bba15001f\bevy_ecs-0.15.2\src\world\unsafe_world_cell.rs:630:18:
attempt to add with overflow
Encountered a panic when applying buffers for system `bevy_sprite::calculate_bounds_2d`!
Encountered a panic in system `bevy_ecs::schedule::executor::apply_deferred`!
```

## Solution

As this value is only used for detecting a change, we can wrap when it
reaches max value.

## Testing

This can be verified by running `cargo run --example observers`
This commit is contained in:
Tristan Maindron 2025-02-26 00:12:51 +01:00 committed by GitHub
parent b43c8f8c4f
commit 0f153ffb44
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/bevy_ecs/src/world/unsafe_world_cell.rs
View File

@ -671,7 +671,9 @@ impl<'w> UnsafeWorldCell<'w> {
pub(crate) unsafe fn increment_trigger_id(self) { pub(crate) unsafe fn increment_trigger_id(self) {
self.assert_allows_mutable_access(); self.assert_allows_mutable_access();
// SAFETY: Caller ensure there are no outstanding references // SAFETY: Caller ensure there are no outstanding references
unsafe { (*self.ptr).last_trigger_id += 1 } unsafe {
(*self.ptr).last_trigger_id = (*self.ptr).last_trigger_id.wrapping_add(1);
}
} }
} }