mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2024-11-19 09:54:16 +01:00
Code Issues Projects Releases Wiki Activity

lightning-cli: Be more discerning about literals.

Browse Source 
Fixes: #574

The issue states that we should follow the standard when
parsing the port for IPv6 [addr]:port syntax, but this is
actually already supported by the daemon. The issue arises
due to the `lightning-cli` misinterpreting [addr]:port as
an array. This modification makes [addr]:port interpreted
as a string.
This commit is contained in:
ZmnSCPxj 2018-02-25 15:37:01 +00:00 committed by Rusty Russell
parent e34be575aa
commit cabeef2d88
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cli/lightning-cli.c
View File

@ -131,13 +131,14 @@ static char *opt_set_ordered(enum input *input)
static bool is_literal(const char *arg)
{
return strspn(arg, "0123456789") == strlen(arg)
size_t arglen = strlen(arg);
return strspn(arg, "0123456789") == arglen
|| streq(arg, "true")
|| streq(arg, "false")
|| streq(arg, "null")
|| arg[0] == '{'
|| arg[0] == '['
|| arg[0] == '"';
|| (arg[0] == '{' && arg[arglen - 1] == '}')
|| (arg[0] == '[' && arg[arglen - 1] == ']')
|| (arg[0] == '"' && arg[arglen - 1] == '"');
}
static void add_input(char **cmd, const char *input,