Avoid mutating shared restore attribute lists - #1574
Merged
Ernst79 merged 1 commit intoSep 8, 2026
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
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
Avoid mutating the shared
RESTORE_ATTRIBUTESlists when restoring entity state.Problem
Several restore paths assigned
RESTORE_ATTRIBUTESdirectly to a local variable and then appended another attribute to it.Because lists are mutable, this modified the shared module-level list in place.
The most significant occurrence was in
device_tracker.data_update(), where the mutation could happen repeatedly during normal BLE updates and continuously add duplicate entries for the lifetime of Home Assistant.The same pattern was also present in the one time restore paths for device tracker, sensor, and binary sensor entities.
Fix
Create a new list containing the base restore attributes plus the entity-specific
mac_addressoruuidattribute instead of appending to the shared list.Restore behavior and attribute ordering remain unchanged, while
RESTORE_ATTRIBUTESitself is no longer modified.