tftp: propagate expired timer from tftp_state_timeout()#18574
Closed
MegaManSec wants to merge 1 commit intocurl:masterfrom
MegaManSec:tftpd
Closed
tftp: propagate expired timer from tftp_state_timeout()#18574MegaManSec wants to merge 1 commit intocurl:masterfrom MegaManSec:tftpd
MegaManSec wants to merge 1 commit intocurl:masterfrom
MegaManSec:tftpd
Conversation
When Curl_timeleft() < 0 we used to return 0, masking the expiry and skipping the caller’s (timeout_ms < 0) path. Now we set FIN and return the negative value so tftp_multi_statemach() aborts with CURLE_OPERATION_TIMEDOUT as intended.
Contributor
Author
|
Also related, but I don't want to send a PR for this because I'm uncertain, it looks like there's a missing check of the return value here (e.g. what happens if the timeout is 0?) |
bagder
approved these changes
Sep 18, 2025
Member
Yeah, that looks like another bug to fix! |
bagder
added a commit
that referenced
this pull request
Sep 18, 2025
Reported-by: Joshua Rogers Ref: #18574 (comment)
Member
|
Thanks! |
bagder
added a commit
that referenced
this pull request
Sep 18, 2025
Reported-by: Joshua Rogers Ref: #18574 (comment) Closes #18603
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
2 participants
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 Curl_timeleft() < 0 we used to return 0, masking the expiry and skipping the caller’s (timeout_ms < 0) path. Now we set FIN and return the negative value so tftp_multi_statemach() aborts with CURLE_OPERATION_TIMEDOUT as intended.