fix: prevent NPE in RetriableStream when cancel() races start() (#12964) [fj4WqyCCw3C5ShR1RfB7MoBPTpkRrBFYP1uT35g3MvT] - #12965
Open
waterWang wants to merge 1 commit into
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.
Fix: Prevent NPE in RetriableStream when cancel() races start()
Bug: When
cancel()is called throughClientCallStreamObserver(from application code inClientResponseObserver.beforeStart()) beforeRetriableStream.start()completes,safeCloseMasterListenertries to dereferencemasterListenerwhich is still null, causing an NPE.Root cause:
ClientCallImpl.startInternalassigns the stream at line 250 and starts it at line 285.RetriableStream.masterListeneris only assigned as the first statement ofstart()(line 388). Acancel()arriving in that window passes thestream != nullguard incancelInternalbut findsmasterListenernull.Fix (two changes):
safeCloseMasterListener: Null-checkmasterListenerbefore dereferencing. IfmasterListeneris null (cancel before start), the close reason is already saved insavedCloseMasterListenerReasonand start() will pick it up.start(): After assigningmasterListener, check ifsavedCloseMasterListenerReasonis already set (from a prior cancel). If so, close immediately with the saved reason instead of proceeding with the normal start flow.Fixes #12964