vty logging: fix crash when missing 'logging enable'
We must explicitly check the return value of osmo_log_vty2tgt(), or may run
into a segfault. I wasn't aware of this and introduced numerous such cases in
I36f17c131cc70ce5a1aef62fd9693097de230cd4.
Reproduce: on the VTY, do not issue 'logging enable', invoke 'logging level
force-all LEVEL' first.
Show in logging_vty_test.vty that this situation is now again amended by
telling the user that logging was not enabled.
Related: OS#3611
Change-Id: Id11702d1801d6654ca5e5a51b597a0d802e2e8dd
diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c
index 31edb52..f3e1419 100644
--- a/src/vty/logging_vty.c
+++ b/src/vty/logging_vty.c
@@ -364,6 +364,10 @@
struct log_target *tgt = osmo_log_vty2tgt(vty);
int level = log_parse_level(argv[0]);
int i;
+
+ if (!tgt)
+ return CMD_WARNING;
+
for (i = 0; i < osmo_log_info->num_cat; i++) {
struct log_category *cat = &tgt->categories[i];
/* skip empty entries in the array */
@@ -391,6 +395,8 @@
{
struct log_target *tgt = osmo_log_vty2tgt(vty);
int level = log_parse_level(argv[0]);
+ if (!tgt)
+ return CMD_WARNING;
log_set_log_level(tgt, level);
return CMD_SUCCESS;
}
@@ -400,6 +406,8 @@
NO_STR LOGGING_STR LEVEL_STR NO_FORCE_ALL_STR)
{
struct log_target *tgt = osmo_log_vty2tgt(vty);
+ if (!tgt)
+ return CMD_WARNING;
log_set_log_level(tgt, 0);
return CMD_SUCCESS;
}