Merge branch 'master' into int-new

This commit is contained in:
Ondrej Zajicek (work) 2017-05-31 14:12:03 +02:00
commit 801fd81efe

View file

@ -261,6 +261,7 @@ cli_command(struct cli *c)
log(L_TRACE "CLI: %s", c->rx_buf); log(L_TRACE "CLI: %s", c->rx_buf);
bzero(&f, sizeof(f)); bzero(&f, sizeof(f));
f.mem = c->parser_pool; f.mem = c->parser_pool;
f.pool = rp_new(c->pool, "Config");
cf_read_hook = cli_cmd_read_hook; cf_read_hook = cli_cmd_read_hook;
cli_rh_pos = c->rx_buf; cli_rh_pos = c->rx_buf;
cli_rh_len = strlen(c->rx_buf); cli_rh_len = strlen(c->rx_buf);
@ -270,6 +271,8 @@ cli_command(struct cli *c)
res = cli_parse(&f); res = cli_parse(&f);
if (!res) if (!res)
cli_printf(c, 9001, f.err_msg); cli_printf(c, 9001, f.err_msg);
config_free(&f);
} }
static void static void