[tcp_proxy] Add nullptr checks to watermark asserts #40034
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
Signed-off-by: Kateryna Nezdolii <kateryna.nezdolii@gmail.com>
|
cc @jrajahalme |
nezdolik
commented
Jun 26, 2025
source/common/tcp_proxy/tcp_proxy.cc
Outdated
| @@ -437,7 +437,8 @@ void Filter::UpstreamCallbacks::onEvent(Network::ConnectionEvent event) { | |||
|
|
|||
| void Filter::UpstreamCallbacks::onAboveWriteBufferHighWatermark() { | |||
| // TCP Tunneling may call on high/low watermark multiple times. | |||
| ASSERT(parent_->config_->tunnelingConfigHelper() || !on_high_watermark_called_); | |||
| ASSERT((parent_ != nullptr && parent_->config_->tunnelingConfigHelper()) || | |||
There was a problem hiding this comment.
in the case when we enter draining state parent_ will be set to nullptr. In draining state if code invokes this callback is will trigger ASSERT failure in non release mode. @ggreenway would this be correct logic to assert fail if callback is invoked in draining state? or should we instead have ASSERT statement like:
ASSERT(parent == nullptr || parent_->config_->tunnelingConfigHelper() || !on_high_watermark_called_);
There was a problem hiding this comment.
Yeah, I think what you wrote in the comment is correct. Please also add a comment explaining the draining case. It looks like the two ASSERTs were the only places using parent_ without checking it for nullptr.
Signed-off-by: Kateryna Nezdolii <kateryna.nezdolii@gmail.com>
ggreenway
approved these changes
Jun 27, 2025
|
/retest |
|
Verify examples ci step fails with cc @phlax |
wbpcode
approved these changes
Jul 1, 2025
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.
Commit Message: Add nullptr checks into watermark asserts in tcp proxy to avoid potential segfaults.
Additional Description:
Risk Level: Low
Testing:
Docs Changes:
Release Notes:
Platform Specific Features: