cleanup: Addressing comments from #165

Thanks @rustyrussell for the feedback :-)
This commit is contained in:
Christian Decker 2017-05-10 11:05:48 +02:00
parent 7dc693963d
commit 75de4476f3
2 changed files with 4 additions and 5 deletions

View File

@ -838,13 +838,12 @@ static struct ipaddr *read_addresses(const tal_t *ctx, u8 *ser)
struct ipaddr *ipaddrs = tal_arr(ctx, struct ipaddr, 0);
int numaddrs = 0;
while (cursor < ser + max) {
numaddrs += 1;
numaddrs++;
tal_resize(&ipaddrs, numaddrs);
fromwire_ipaddr(&cursor, &max, &ipaddrs[numaddrs-1]);
if (cursor == NULL) {
/* Parsing address failed */
tal_free(ipaddrs);
return NULL;
return tal_free(ipaddrs);
}
}
return ipaddrs;

View File

@ -169,11 +169,11 @@ void fromwire_ipaddr(const u8 **cursor, size_t *max, struct ipaddr *addr)
{
/* Skip any eventual padding */
while (**cursor == 0) {
*cursor += 1;
(*cursor)++;
}
addr->type = **cursor;
*cursor += 1;
(*cursor)++;
switch (addr->type) {
case 1:
addr->addrlen = 4;