From 70b091d9f67d68e1cdccd53eed041fba16bb2d68 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Sun, 26 Jun 2022 14:18:01 +0930
Subject: [PATCH] lightningd: fix transient leak report when openingd shutting
 down.

```
>           raiseValueError(str(errors))
E           ValueError:
E           Node errors:
E           Global errors:
E            - Node /tmp/ltests-x5sfpiwp/test_openchannel_hook_chaining_1/lightning-2/ has memory leaks: [
E               {
E                   "backtrace": [
E                       "ccan/ccan/tal/tal.c:442 (tal_alloc_)",
E                       "ccan/ccan/io/io.c:91 (io_new_conn_)",
E                       "lightningd/subd.c:773 (new_subd)",
E                       "lightningd/subd.c:827 (new_channel_subd_)",
E                       "lightningd/opening_control.c:870 (peer_start_openingd)",
E                       "lightningd/peer_control.c:1307 (peer_active)",
E                       "lightningd/connect_control.c:457 (connectd_msg)",
E                       "lightningd/subd.c:556 (sd_msg_read)",
E                       "lightningd/subd.c:357 (read_fds)",
E                       "ccan/ccan/io/io.c:59 (next_plan)",
E                       "ccan/ccan/io/io.c:407 (do_plan)",
E                       "ccan/ccan/io/io.c:417 (io_ready)",
E                       "ccan/ccan/io/poll.c:453 (io_loop)",
E                       "lightningd/io_loop_with_timers.c:22 (io_loop_with_timers)",
E                       "lightningd/lightningd.c:1181 (main)",
E                       "../csu/libc-start.c:308 (__libc_start_main)"
E                   ],
E                   "label": "ccan/ccan/io/io.c:91:struct io_conn",
E                   "parents": [
E                       "lightningd/lightningd.c:107:struct lightningd"
E                   ],
E                   "value": "0x2b5a898"
E               }
E           ]
```

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 lightningd/opening_control.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lightningd/opening_control.c b/lightningd/opening_control.c
index 17bffd21d..5eda78580 100644
--- a/lightningd/opening_control.c
+++ b/lightningd/opening_control.c
@@ -11,6 +11,7 @@
 #include <common/json_command.h>
 #include <common/json_helpers.h>
 #include <common/json_tok.h>
+#include <common/memleak.h>
 #include <common/param.h>
 #include <common/type_to_string.h>
 #include <connectd/connectd_wiregen.h>
@@ -675,7 +676,8 @@ openchannel_hook_final(struct openchannel_hook_payload *payload STEALS)
 	} else
 		upfront_shutdown_script_wallet_index = NULL;
 
-
+	/* In case peer goes away right now, mark openingd notleak() */
+	notleak(openingd);
 	subd_send_msg(openingd,
 		      take(towire_openingd_got_offer_reply(NULL, errmsg,
 							   our_upfront_shutdown_script,