lightningd: don't turn zero-length tlv fields into NULL.

Fixes: #4667 Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
ElementsProject · Jul 21, 2021 · 2f02994 · 2f02994
1 parent ba9251b
commit 2f02994
Show file tree

Hide file tree

Showing 41 changed files with 68 additions and 69 deletions.
diff --git a/channeld/channeld_wiregen.c b/channeld/channeld_wiregen.c
diff --git a/channeld/channeld_wiregen.h b/channeld/channeld_wiregen.h
diff --git a/closingd/closingd_wiregen.c b/closingd/closingd_wiregen.c
diff --git a/closingd/closingd_wiregen.h b/closingd/closingd_wiregen.h
diff --git a/common/peer_status_wiregen.c b/common/peer_status_wiregen.c
diff --git a/common/peer_status_wiregen.h b/common/peer_status_wiregen.h
diff --git a/common/status_wiregen.c b/common/status_wiregen.c
diff --git a/common/status_wiregen.h b/common/status_wiregen.h
diff --git a/connectd/connectd_gossipd_wiregen.c b/connectd/connectd_gossipd_wiregen.c
diff --git a/connectd/connectd_gossipd_wiregen.h b/connectd/connectd_gossipd_wiregen.h
diff --git a/connectd/connectd_wiregen.c b/connectd/connectd_wiregen.c
diff --git a/connectd/connectd_wiregen.h b/connectd/connectd_wiregen.h
diff --git a/doc/lightning-offer.7 b/doc/lightning-offer.7
diff --git a/gossipd/gossip_store_wiregen.c b/gossipd/gossip_store_wiregen.c
diff --git a/gossipd/gossip_store_wiregen.h b/gossipd/gossip_store_wiregen.h
diff --git a/gossipd/gossipd_peerd_wiregen.c b/gossipd/gossipd_peerd_wiregen.c
diff --git a/gossipd/gossipd_peerd_wiregen.h b/gossipd/gossipd_peerd_wiregen.h
diff --git a/gossipd/gossipd_wiregen.c b/gossipd/gossipd_wiregen.c
diff --git a/gossipd/gossipd_wiregen.h b/gossipd/gossipd_wiregen.h
diff --git a/hsmd/hsmd_wiregen.c b/hsmd/hsmd_wiregen.c
diff --git a/hsmd/hsmd_wiregen.h b/hsmd/hsmd_wiregen.h
diff --git a/onchaind/onchaind_wiregen.c b/onchaind/onchaind_wiregen.c
diff --git a/onchaind/onchaind_wiregen.h b/onchaind/onchaind_wiregen.h
diff --git a/openingd/dualopend_wiregen.c b/openingd/dualopend_wiregen.c
diff --git a/openingd/dualopend_wiregen.h b/openingd/dualopend_wiregen.h
diff --git a/openingd/openingd_wiregen.c b/openingd/openingd_wiregen.c
diff --git a/openingd/openingd_wiregen.h b/openingd/openingd_wiregen.h
diff --git a/tests/test_pay.py b/tests/test_pay.py
@@ -3923,7 +3923,6 @@ def test_offer_needs_option(node_factory):
         l1.rpc.call('fetchinvoice', {'offer': 'aaaa'})
 
 
-@pytest.mark.xfail(strict=True)
 def test_offer(node_factory, bitcoind):
     plugin = os.path.join(os.path.dirname(__file__), 'plugins/currencyUSDAUD5000.py')
     l1 = node_factory.get_node(options={'plugin': plugin, 'experimental-offers': None})

diff --git a/tools/gen/impl_template b/tools/gen/impl_template
@@ -79,7 +79,7 @@ towire_${type_obj.name}(${ptr}, ${'' if type_obj.is_assignable() or type_obj.is_
     % if f.type_obj.has_array_helper():
     ## We assume array helpers only deal with things literally transcribed!!
 	% if f.is_varlen():
-${fieldname} = ${f.size('*plen')} ? tal_arr(${ctx}, ${typename}, ${f.size('*plen')}) : NULL;
+${fieldname} = tal_arr(${ctx}, ${typename}, ${f.size('*plen')});
 	% endif
 fromwire_${type_}_array(cursor, plen, ${fieldname}, ${f.size('*plen')});
     % else:

diff --git a/wire/bolt12_wiregen.c b/wire/bolt12_wiregen.c
diff --git a/wire/bolt12_wiregen.h b/wire/bolt12_wiregen.h
diff --git a/wire/common_wiregen.c b/wire/common_wiregen.c
diff --git a/wire/common_wiregen.h b/wire/common_wiregen.h
diff --git a/wire/onion_printgen.c b/wire/onion_printgen.c
diff --git a/wire/onion_printgen.h b/wire/onion_printgen.h