splice: minor code cleanups #6729
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
A few little stylistic things were bugging me when reading through the splice code so I cleaned them up. ChangeLog-None
rustyrussell
force-pushed
the
ddustin/splice_cleanup
branch
from
fa99d92 to
25f7b71
Compare
|
Trivial rebase on master for CI... |
In this case, we were allocating off NULL, which meant a leak:
```
MEMLEAK: 0x565086722e98
label=channeld/channeld.c:3433:struct inflight
backtrace:
ccan/ccan/tal/tal.c:477 (tal_alloc_)
channeld/channeld.c:3433 (inflights_new)
channeld/channeld.c:3573 (splice_accepter)
channeld/channeld.c:4145 (peer_in)
channeld/channeld.c:6051 (main)
parents:
```
Signed-off-by: Rusty Russell <[email protected]>
|
Fixed memleak due to tal off NULL.... |
We steal it onto "peer" where we should steal it onto the inflight: ``` label=struct bitcoin_tx backtrace: ccan/ccan/tal/tal.c:477 (tal_alloc_) bitcoin/tx.c:612 (clone_bitcoin_tx) channeld/channeld.c:2163 (handle_peer_commit_sig) channeld/channeld.c:2191 (handle_peer_commit_sig) channeld/channeld.c:2831 (interactive_send_commitments) channeld/channeld.c:3814 (splice_initiator_user_finalized) channeld/channeld.c:3882 (splice_initiator_user_update) channeld/channeld.c:5651 (req_in) channeld/channeld.c:6044 (main) ../sysdeps/nptl/libc_start_call_main.h:58 (__libc_start_call_main) ../csu/libc-start.c:360 (__libc_start_main_impl) parents: struct peer ``` Signed-off-by: Rusty Russell <[email protected]>
|
Thanks for the memory fixes 🙏. Looks like this was triggered by removing the ugly way of explicitly free'ing: 25f7b71#diff-b1299b24697159a06e7b426c5086c36df8e48db15739a0e301d53a9a21149722L770 |
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.
A few little stylistic things were bugging me when reading through the splice code so I cleaned them up.
ChangeLog-None