fix(conn): guard against nil MaintNotificationsConfig in initConn#3707
Merged
ndyakov merged 2 commits intoredis:masterfrom Feb 11, 2026
Merged
Conversation
In initConn, line 540 accessed MaintNotificationsConfig.EndpointType unconditionally, even though line 538 correctly nil-checked MaintNotificationsConfig. When MaintNotificationsConfig is nil, this caused a nil pointer dereference panic and left optLock.RLock held, leading to a deadlock on the next call. Move the EndpointType access inside a nil guard to match the existing nil check for the Mode field. Fixes redis#3675 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Member
|
Thank you @veeceey, I think we can directly use |
ndyakov
previously approved these changes
Feb 10, 2026
Contributor
Author
|
Good point, that does read better. Updated to use |
ndyakov
approved these changes
Feb 11, 2026
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
initConnwhenMaintNotificationsConfigis nilProblem
In
baseClient.initConn(), line 540 accessedMaintNotificationsConfig.EndpointTypeunconditionally, even though line 538 correctly nil-checkedMaintNotificationsConfigvia short-circuit evaluation:When
MaintNotificationsConfigis nil, this causes:optLock.RLock()is left held (never reachesRUnlock()), causing a deadlock on the next callFix
Move the
EndpointTypeaccess inside a nil guard, consistent with the existing nil check on theModefield:Test plan
TestInitConnNilMaintNotificationsConfigregression testgo vet ./...passesgo build ./...passesTestGinkgoSuitefails, which requires a running Redis server)Fixes #3675
🤖 Generated with Claude Code