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

lightningd, libplugins: allocate opt strings from tmpctx, not NULL.

Browse Source 
Previously, if these failed we always exited; once we have dymamic
configs this would be a (tiny) memory leak, so use tmpctx.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2023-06-06 10:08:47 +09:30
parent aca893f1eb
commit ecc030f12d
6 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lightningd/log.c
View File

@ -581,7 +581,7 @@ char *opt_log_level(const char *arg, struct log *log)
len = strcspn(arg, ":");
if (!log_level_parse(arg, len, &level))
return tal_fmt(NULL, "unknown log level %.*s", len, arg);
return tal_fmt(tmpctx, "unknown log level %.*s", len, arg);
if (arg[len]) {
struct print_filter *f = tal(log->lr, struct print_filter);
@ -717,7 +717,7 @@ char *arg_log_to_file(const char *arg, struct lightningd *ld)
else {
outf = fopen(arg, "a");
if (!outf)
return tal_fmt(NULL, "Failed to open: %s", strerror(errno));
return tal_fmt(tmpctx, "Failed to open: %s", strerror(errno));
}
tal_arr_expand(&ld->logfiles, tal_strdup(ld->logfiles, arg));

64
lightningd/options.c
View File

@ -43,10 +43,10 @@ static char *opt_set_u64(const char *arg, u64 *u)
errno = 0;
l = strtoull(arg, &endp, 0);
if (*endp || !arg[0])
return tal_fmt(NULL, "'%s' is not a number", arg);
return tal_fmt(tmpctx, "'%s' is not a number", arg);
*u = l;
if (errno || *u != l)
return tal_fmt(NULL, "'%s' is out of range", arg);
return tal_fmt(tmpctx, "'%s' is out of range", arg);
return NULL;
}
static char *opt_set_u32(const char *arg, u32 *u)
@ -60,10 +60,10 @@ static char *opt_set_u32(const char *arg, u32 *u)
errno = 0;
l = strtoul(arg, &endp, 0);
if (*endp || !arg[0])
return tal_fmt(NULL, "'%s' is not a number", arg);
return tal_fmt(tmpctx, "'%s' is not a number", arg);
*u = l;
if (errno || *u != l)
return tal_fmt(NULL, "'%s' is out of range", arg);
return tal_fmt(tmpctx, "'%s' is out of range", arg);
return NULL;
}
@ -78,10 +78,10 @@ static char *opt_set_s32(const char *arg, s32 *u)
errno = 0;
l = strtol(arg, &endp, 0);
if (*endp || !arg[0])
return tal_fmt(NULL, "'%s' is not a number", arg);
return tal_fmt(tmpctx, "'%s' is not a number", arg);
*u = l;
if (errno || *u != l)
return tal_fmt(NULL, "'%s' is out of range", arg);
return tal_fmt(tmpctx, "'%s' is out of range", arg);
return NULL;
}
@ -130,13 +130,13 @@ static char *opt_set_mode(const char *arg, mode_t *m)
/* Ensure length, and starts with 0. */
if (strlen(arg) != 4 || arg[0] != '0')
return tal_fmt(NULL, "'%s' is not a file mode", arg);
return tal_fmt(tmpctx, "'%s' is not a file mode", arg);
/* strtol, manpage, yech. */
errno = 0;
l = strtol(arg, &endp, 8); /* Octal. */
if (errno || *endp)
return tal_fmt(NULL, "'%s' is not a file mode", arg);
return tal_fmt(tmpctx, "'%s' is not a file mode", arg);
*m = l;
/* Range check not needed, previous strlen checks ensures only
* 9-bit, which fits mode_t (unless your Unix is seriously borked).
@ -254,7 +254,7 @@ static char *opt_add_addr_withtype(const char *arg,
err_msg = parse_wireaddr_internal(tmpctx, arg, ld->portnum,
dns_lookup_ok, &wi);
if (err_msg)
return tal_fmt(NULL, "Unable to parse address '%s': %s", arg, err_msg);
return tal_fmt(tmpctx, "Unable to parse address '%s': %s", arg, err_msg);
/* Check they didn't specify some weird type! */
switch (wi.itype) {
@ -263,7 +263,7 @@ static char *opt_add_addr_withtype(const char *arg,
case ADDR_TYPE_IPV4:
case ADDR_TYPE_IPV6:
if ((ala & ADDR_ANNOUNCE) && wi.u.allproto.is_websocket)
return tal_fmt(NULL,
return tal_fmt(tmpctx,
"Cannot announce websocket address, use --bind-addr=%s", arg);
/* These can be either bind or announce */
break;
@ -274,7 +274,7 @@ static char *opt_add_addr_withtype(const char *arg,
switch (ala) {
case ADDR_LISTEN:
if (!deprecated_apis)
return tal_fmt(NULL,
return tal_fmt(tmpctx,
"Don't use --bind-addr=%s, use --announce-addr=%s",
arg, arg);
log_unusual(ld->log,
@ -286,7 +286,7 @@ static char *opt_add_addr_withtype(const char *arg,
return NULL;
case ADDR_LISTEN_AND_ANNOUNCE:
if (!deprecated_apis)
return tal_fmt(NULL,
return tal_fmt(tmpctx,
"Don't use --addr=%s, use --announce-addr=%s",
arg, arg);
log_unusual(ld->log,
@ -306,10 +306,10 @@ static char *opt_add_addr_withtype(const char *arg,
case ADDR_ANNOUNCE:
break;
case ADDR_LISTEN:
return tal_fmt(NULL,
return tal_fmt(tmpctx,
"Cannot use dns: prefix with --bind-addr, use --bind-addr=%s", arg + strlen("dns:"));
case ADDR_LISTEN_AND_ANNOUNCE:
return tal_fmt(NULL,
return tal_fmt(tmpctx,
"Cannot use dns: prefix with --addr, use --bind-addr=%s and --addr=%s",
arg + strlen("dns:"),
arg);
@ -320,18 +320,18 @@ static char *opt_add_addr_withtype(const char *arg,
* - MUST NOT announce more than one `type 5` DNS hostname.
*/
if (num_announced_types(ADDR_TYPE_DNS, ld) > 0)
return tal_fmt(NULL, "Only one DNS can be announced");
return tal_fmt(tmpctx, "Only one DNS can be announced");
break;
}
break;
case ADDR_INTERNAL_SOCKNAME:
switch (ala) {
case ADDR_ANNOUNCE:
return tal_fmt(NULL,
return tal_fmt(tmpctx,
"Cannot announce sockets, try --bind-addr=%s", arg);
case ADDR_LISTEN_AND_ANNOUNCE:
if (!deprecated_apis)
return tal_fmt(NULL, "Don't use --addr=%s, use --bind-addr=%s",
return tal_fmt(tmpctx, "Don't use --addr=%s, use --bind-addr=%s",
arg, arg);
ala = ADDR_LISTEN;
/* Fall thru */
@ -355,10 +355,10 @@ static char *opt_add_addr_withtype(const char *arg,
/* You can only bind to wildcard, and optionally announce */
switch (ala) {
case ADDR_ANNOUNCE:
return tal_fmt(NULL, "Cannot use wildcard address '%s'", arg);
return tal_fmt(tmpctx, "Cannot use wildcard address '%s'", arg);
case ADDR_LISTEN_AND_ANNOUNCE:
if (wi.u.allproto.is_websocket)
return tal_fmt(NULL,
return tal_fmt(tmpctx,
"Cannot announce websocket address, use --bind-addr=%s", arg);
/* fall thru */
case ADDR_LISTEN:
@ -368,7 +368,7 @@ static char *opt_add_addr_withtype(const char *arg,
case ADDR_INTERNAL_FORPROXY:
/* You can't use these addresses here at all: this means we've
* suppressed DNS and given a string-style name */
return tal_fmt(NULL, "Cannot resolve address '%s' (not using DNS!)", arg);
return tal_fmt(tmpctx, "Cannot resolve address '%s' (not using DNS!)", arg);
}
/* Sanity check for exact duplicates. */
@ -378,7 +378,7 @@ static char *opt_add_addr_withtype(const char *arg,
continue;
if (wireaddr_internal_eq(&ld->proposed_wireaddr[i], &wi))
return tal_fmt(NULL, "Duplicate %s address %s",
return tal_fmt(tmpctx, "Duplicate %s address %s",
ala & ADDR_ANNOUNCE ? "announce" : "listen",
type_to_string(tmpctx, struct wireaddr_internal, &wi));
}
@ -413,11 +413,11 @@ static char *opt_subdaemon(const char *arg, struct lightningd *ld)
size_t colonoff = strcspn(arg, ":");
if (!arg[colonoff])
return tal_fmt(NULL, "argument must contain ':'");
return tal_fmt(tmpctx, "argument must contain ':'");
subdaemon = tal_strndup(ld, arg, colonoff);
if (!is_subdaemon(subdaemon))
return tal_fmt(NULL, "\"%s\" is not a subdaemon", subdaemon);
return tal_fmt(tmpctx, "\"%s\" is not a subdaemon", subdaemon);
/* Make the value a tal-child of the subdaemon */
sdpath = tal_strdup(subdaemon, arg + colonoff + 1);
@ -476,7 +476,7 @@ static char *opt_set_rgb(const char *arg, struct lightningd *ld)
*/
ld->rgb = tal_hexdata(ld, arg, strlen(arg));
if (!ld->rgb || tal_count(ld->rgb) != 3)
return tal_fmt(NULL, "rgb '%s' is not six hex digits", arg);
return tal_fmt(tmpctx, "rgb '%s' is not six hex digits", arg);
return NULL;
}
@ -503,7 +503,7 @@ static char *opt_set_alias(const char *arg, struct lightningd *ld)
* `alias` trailing-bytes equal to 0.
*/
if (strlen(arg) > 32)
return tal_fmt(NULL, "Alias '%s' is over 32 characters", arg);
return tal_fmt(tmpctx, "Alias '%s' is over 32 characters", arg);
ld->alias = tal_arrz(ld, u8, 33);
strncpy((char*)ld->alias, arg, 32);
return NULL;
@ -542,7 +542,7 @@ static char *opt_add_plugin(const char *arg, struct lightningd *ld)
}
p = plugin_register(ld->plugins, arg, NULL, false, NULL, NULL);
if (!p)
return tal_fmt(NULL, "Failed to register %s: %s", arg, strerror(errno));
return tal_fmt(tmpctx, "Failed to register %s: %s", arg, strerror(errno));
return NULL;
}
@ -579,7 +579,7 @@ static char *opt_important_plugin(const char *arg, struct lightningd *ld)
}
p = plugin_register(ld->plugins, arg, NULL, true, NULL, NULL);
if (!p)
return tal_fmt(NULL, "Failed to register %s: %s", arg, strerror(errno));
return tal_fmt(tmpctx, "Failed to register %s: %s", arg, strerror(errno));
return NULL;
}
@ -656,7 +656,7 @@ static char *opt_force_privkey(const char *optarg, struct lightningd *ld)
ld->dev_force_privkey = tal(ld, struct privkey);
if (!hex_decode(optarg, strlen(optarg),
ld->dev_force_privkey, sizeof(*ld->dev_force_privkey)))
return tal_fmt(NULL, "Unable to parse privkey '%s'", optarg);
return tal_fmt(tmpctx, "Unable to parse privkey '%s'", optarg);
return NULL;
}
@ -667,7 +667,7 @@ static char *opt_force_bip32_seed(const char *optarg, struct lightningd *ld)
if (!hex_decode(optarg, strlen(optarg),
ld->dev_force_bip32_seed,
sizeof(*ld->dev_force_bip32_seed)))
return tal_fmt(NULL, "Unable to parse secret '%s'", optarg);
return tal_fmt(tmpctx, "Unable to parse secret '%s'", optarg);
return NULL;
}
@ -678,7 +678,7 @@ static char *opt_force_tmp_channel_id(const char *optarg, struct lightningd *ld)
if (!hex_decode(optarg, strlen(optarg),
ld->dev_force_tmp_channel_id,
sizeof(*ld->dev_force_tmp_channel_id)))
return tal_fmt(NULL, "Unable to parse channel id '%s'", optarg);
return tal_fmt(tmpctx, "Unable to parse channel id '%s'", optarg);
return NULL;
}
@ -1109,7 +1109,7 @@ static bool opt_show_msat(char *buf, size_t len, const struct amount_msat *msat)
static char *opt_set_msat(const char *arg, struct amount_msat *amt)
{
if (!parse_amount_msat(amt, arg, strlen(arg)))
return tal_fmt(NULL, "Unable to parse millisatoshi '%s'", arg);
return tal_fmt(tmpctx, "Unable to parse millisatoshi '%s'", arg);
return NULL;
}
@ -1136,7 +1136,7 @@ static char *opt_set_websocket_port(const char *arg, struct lightningd *ld)
ld->websocket_port = port;
if (ld->websocket_port != port)
return tal_fmt(NULL, "'%s' is out of range", arg);
return tal_fmt(tmpctx, "'%s' is out of range", arg);
return NULL;
}

4
lightningd/plugin.c
View File

@ -1698,7 +1698,7 @@ char *add_plugin_dir(struct plugins *plugins, const char *dir, bool error_ok)
if (!d) {
if (!error_ok && errno == ENOENT)
return NULL;
return tal_fmt(NULL, "Failed to open plugin-dir %s: %s",
return tal_fmt(tmpctx, "Failed to open plugin-dir %s: %s",
dir, strerror(errno));
}
@ -1718,7 +1718,7 @@ char *add_plugin_dir(struct plugins *plugins, const char *dir, bool error_ok)
NULL, NULL);
if (!p && !error_ok) {
closedir(d);
return tal_fmt(NULL, "Failed to register %s: %s",
return tal_fmt(tmpctx, "Failed to register %s: %s",
fullpath, strerror(errno));
}
}

10
plugins/funder.c
View File

@ -1523,14 +1523,14 @@ static char *option_channel_base(const char *arg, struct funder_policy *policy)
struct amount_msat amt;
if (!parse_amount_msat(&amt, arg, strlen(arg)))
return tal_fmt(NULL, "Unable to parse amount '%s'", arg);
return tal_fmt(tmpctx, "Unable to parse amount '%s'", arg);
if (!policy->rates)
policy->rates = default_lease_rates(policy);
if (!assign_overflow_u32(&policy->rates->channel_fee_max_base_msat,
amt.millisatoshis)) /* Raw: conversion */
return tal_fmt(NULL, "channel_fee_max_base_msat overflowed");
return tal_fmt(tmpctx, "channel_fee_max_base_msat overflowed");
return NULL;
}
@ -1547,7 +1547,7 @@ option_channel_fee_proportional_thousandths_max(const char *arg,
static char *amount_option(const char *arg, struct amount_sat *amt)
{
if (!parse_amount_sat(amt, arg, strlen(arg)))
return tal_fmt(NULL, "Unable to parse amount '%s'", arg);
return tal_fmt(tmpctx, "Unable to parse amount '%s'", arg);
return NULL;
}
@ -1566,7 +1566,7 @@ static char *option_lease_fee_base(const char *arg,
if (!assign_overflow_u32(&policy->rates->lease_fee_base_sat,
amt.satoshis)) /* Raw: conversion */
return tal_fmt(NULL, "lease_fee_base_sat overflowed");
return tal_fmt(tmpctx, "lease_fee_base_sat overflowed");
return NULL;
}
@ -1596,7 +1596,7 @@ static char *amount_sat_or_u64_option(const char *arg, u64 *amt)
if (err) {
tal_free(err);
if (!parse_amount_sat(&sats, arg, strlen(arg)))
return tal_fmt(NULL,
return tal_fmt(tmpctx,
"Unable to parse option '%s'",
arg);

2
plugins/funder_policy.c
View File

@ -30,7 +30,7 @@ char *funding_option(const char *arg, enum funder_opt *opt)
else if (streq(arg, "fixed"))
*opt = FIXED;
else
return tal_fmt(NULL, "'%s' is not a valid option"
return tal_fmt(tmpctx, "'%s' is not a valid option"
" (match, available, fixed)",
arg);
return NULL;

20
plugins/libplugin.c
View File

@ -1233,9 +1233,9 @@ char *u64_option(const char *arg, u64 *i)
errno = 0;
*i = strtol(arg, &endp, 0);
if (*endp || !arg[0])
return tal_fmt(NULL, "'%s' is not a number", arg);
return tal_fmt(tmpctx, "'%s' is not a number", arg);
if (errno)
return tal_fmt(NULL, "'%s' is out of range", arg);
return tal_fmt(tmpctx, "'%s' is out of range", arg);
return NULL;
}
@ -1247,13 +1247,13 @@ char *u32_option(const char *arg, u32 *i)
errno = 0;
n = strtoul(arg, &endp, 0);
if (*endp || !arg[0])
return tal_fmt(NULL, "'%s' is not a number", arg);
return tal_fmt(tmpctx, "'%s' is not a number", arg);
if (errno)
return tal_fmt(NULL, "'%s' is out of range", arg);
return tal_fmt(tmpctx, "'%s' is out of range", arg);
*i = n;
if (*i != n)
return tal_fmt(NULL, "'%s' is too large (overflow)", arg);
return tal_fmt(tmpctx, "'%s' is too large (overflow)", arg);
return NULL;
}
@ -1266,13 +1266,13 @@ char *u16_option(const char *arg, u16 *i)
errno = 0;
n = strtoul(arg, &endp, 0);
if (*endp || !arg[0])
return tal_fmt(NULL, "'%s' is not a number", arg);
return tal_fmt(tmpctx, "'%s' is not a number", arg);
if (errno)
return tal_fmt(NULL, "'%s' is out of range", arg);
return tal_fmt(tmpctx, "'%s' is out of range", arg);
*i = n;
if (*i != n)
return tal_fmt(NULL, "'%s' is too large (overflow)", arg);
return tal_fmt(tmpctx, "'%s' is too large (overflow)", arg);
return NULL;
}
@ -1280,7 +1280,7 @@ char *u16_option(const char *arg, u16 *i)
char *bool_option(const char *arg, bool *i)
{
if (!streq(arg, "true") && !streq(arg, "false"))
return tal_fmt(NULL, "'%s' is not a bool, must be \"true\" or \"false\"", arg);
return tal_fmt(tmpctx, "'%s' is not a bool, must be \"true\" or \"false\"", arg);
*i = streq(arg, "true");
return NULL;
@ -1292,7 +1292,7 @@ char *flag_option(const char *arg, bool *i)
* by default */
assert(*i == false);
if (!streq(arg, "true"))
return tal_fmt(NULL, "Invalid argument '%s' passed to a flag", arg);
return tal_fmt(tmpctx, "Invalid argument '%s' passed to a flag", arg);
*i = true;
return NULL;