passwordEntry: guard against None layout sources#504
Open
H3xano wants to merge 1 commit into
Open
Conversation
When the screensaver fails to connect to Cinnamon (logged as 'Failed to connect to Cinnamon'), lockscreen_layout_source and system_layout_source remain None. Three methods then crash dereferencing them: - restore_original_layout(): AttributeError on .index - on_draw(): AttributeError on .flag_name / .short_name - update_layout_icon(): AttributeError on .display_name Add early-return guards in all three methods. Reproduces on: Cinnamon 6.6.x, NVIDIA GPU, single keyboard layout (us), after unlock from screensaver.
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
1 participant
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.
When the screensaver fails to connect to Cinnamon (this is logged as
"Failed to connect to Cinnamon - screensaver will not activate when
expo or overview modes are active"),
lockscreen_layout_sourceandsystem_layout_sourceremainNone(initialized at init butonly set in
on_layout_sources_changedif the Cinnamon dbusconnection succeeds).
Three methods then crash by dereferencing them:
restore_original_layout():AttributeError: 'NoneType' object has no attribute 'index'on_draw(): AttributeError on.flag_name/.short_nameupdate_layout_icon(): AttributeError on.display_nameThe crash in
restore_original_layout()was consistently reproducibleon every unlock on an NVIDIA system (Cinnamon 6.6.x, Linux Mint Zena,
single
uskeyboard layout) where the Cinnamon dbus connection wasunavailable at screensaver start.
Fix: add early-return guards at the top of all three affected methods.