-
Notifications
You must be signed in to change notification settings - Fork 1.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix nil pointer exception when wrapping listener #43201
Merged
Merged
Conversation
This file contains 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
Joerger
added
no-changelog
Indicates that a PR does not require a changelog entry
backport/branch/v14
backport/branch/v15
backport/branch/v16
labels
Jun 18, 2024
zmb3
reviewed
Jun 18, 2024
lib/limiter/limiter.go
Outdated
@@ -180,7 +180,10 @@ func (l *Limiter) StreamServerInterceptor(srv interface{}, serverStream grpc.Ser | |||
|
|||
// WrapListener returns a [Listener] that wraps the provided listener | |||
// with one that limits connections | |||
func (l *Limiter) WrapListener(ln net.Listener) *Listener { | |||
func (l *Limiter) WrapListener(ln net.Listener) net.Listener { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we be adding nil checks at the call-site now?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changed WrapListener
to return an error instead.
Joerger
force-pushed
the
joerger/fix-segfault-on-wrapped-listener
branch
from
June 18, 2024 19:15
c21c46e
to
0b5b827
Compare
Joerger
force-pushed
the
joerger/fix-segfault-on-wrapped-listener
branch
from
June 18, 2024 19:16
0b5b827
to
a97877a
Compare
espadolini
approved these changes
Jun 19, 2024
gabrielcorado
approved these changes
Jun 21, 2024
Joerger
added a commit
that referenced
this pull request
Jun 21, 2024
Joerger
added a commit
that referenced
this pull request
Jun 21, 2024
This was referenced Jun 21, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
backport/branch/v14
backport/branch/v15
backport/branch/v16
no-changelog
Indicates that a PR does not require a changelog entry
size/sm
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.
Fixes #24310
Note: this does not fix #9350, which should be solved with better detection/errors around what listeners are necessary and missing.