splice: Clean up warning message - #9359
Open
ddustin wants to merge 1 commit into
Open
Conversation
Changelog-None
ddustin
force-pushed
the
ddustin/cleaner_splice_error
branch
from
July 28, 2026 15:27
3144726 to
53d9cbb
Compare
Andezion
requested changes
Jul 28, 2026
Andezion
left a comment
Collaborator
There was a problem hiding this comment.
The idea is right and matches the existing error-handling pattern in this function. Should splice_accepter() get a symmetric guard?
| @@ -4417,6 +4417,12 @@ static void splice_initiator(struct peer *peer, const u8 *inmsg) | |||
|
|
|||
| type = fromwire_peektype(inmsg); | |||
|
|
|||
Collaborator
There was a problem hiding this comment.
Didn't the check placed too late to do anything? Look at the top of the function -
static void splice_initiator(struct peer *peer, const u8 *inmsg)
{
/ some code /
struct wally_psbt *psbt = peer->splicing->current_psbt; - on line 4412
/ some code /
type = fromwire_peektype(inmsg); - on line 4418
if (!peer->splicing) { - and here we have new check
peer_failed_warn(...);
}
}
So psbt is initialized from peer->splicing->current_psbt in the declaration block, which executes before type = fromwire_peektype(inmsg) and before the new if (!peer->splicing) check. If peer->splicing is NULL, the function already dereferences it at line 4412 and crashes - so the new check is unreachable code?
Maybe we should move the NULL check to the very first line of the function, before psbt is declared/initialized?
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.
Add a clean warning message if peer sends junk ACK data.