From be6347b814fa6bb9fad450bc25e59436447328d7 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 26 Jun 2017 10:39:49 +0930 Subject: [PATCH] tools/generate-wire.py: unmarshall zero-length arrays as NULL. This is symmetrical with marshalling. Signed-off-by: Rusty Russell --- tools/generate-wire.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/generate-wire.py b/tools/generate-wire.py index 6ae1e9acb..6f3eb3879 100755 --- a/tools/generate-wire.py +++ b/tools/generate-wire.py @@ -289,8 +289,8 @@ class Message(object): f.num_elems) elif f.is_variable_size(): subcalls.append("\t//2th case {name}".format(name=f.name)) - subcalls.append('\t*{} = tal_arr(ctx, {}, {});' - .format(f.name, f.fieldtype.name, f.lenvar)) + subcalls.append('\t*{} = {} ? tal_arr(ctx, {}, {}) : NULL;' + .format(f.name, f.lenvar, f.fieldtype.name, f.lenvar)) self.print_fromwire_array(subcalls, basetype, f, '*'+f.name, f.lenvar)