From 52c465fef07de6eccff46dda79e28cd946dfc61a Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Tue, 20 Oct 2020 14:28:06 +1030
Subject: [PATCH] common/gossmap: fix gossmap_node_get_announce() on
 unannounced nodes.

We would return junk before.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 common/gossmap.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/common/gossmap.c b/common/gossmap.c
index ee46abae6..f77c8ec09 100644
--- a/common/gossmap.c
+++ b/common/gossmap.c
@@ -823,8 +823,14 @@ u8 *gossmap_node_get_announce(const tal_t *ctx,
 			      const struct gossmap *map,
 			      const struct gossmap_node *n)
 {
-	u16 len = map_be16(map, n->nann_off);
-	u8 *msg = tal_arr(ctx, u8, len);
+	u16 len;
+	u8 *msg;
+
+	if (n->nann_off == 0)
+		return NULL;
+
+	len = map_be16(map, n->nann_off);
+	msg = tal_arr(ctx, u8, len);
 
 	map_copy(map, n->nann_off, msg, len);
 	return msg;