[MERGED] libosmocore[master]: vty: Skip printing non-initialized log categories

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: vty: Skip printing non-initialized log categories
......................................................................


vty: Skip printing non-initialized log categories

Without this patch the vty command show logging vty will cause a segfault if
not all elements of the log_categories array are defined.

Ticket: OW#3053
Sponsored-by: On-Waves ehf
Change-Id: Ieeba649c3bde6c9376d8e32b00b92beb37c08ef2
---
M src/vty/logging_vty.c
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c
index a23c1a7..d2fca81 100644
--- a/src/vty/logging_vty.c
+++ b/src/vty/logging_vty.c
@@ -275,6 +275,9 @@
 
 	for (i = 0; i < info->num_cat; i++) {
 		const struct log_category *cat = &tgt->categories[i];
+		/* Skip categories that were not initialized */
+		if (!info->cat[i].name)
+			continue;
 		vty_out(vty, "  %-10s %-10s %-8s %s%s",
 			info->cat[i].name+1, log_level_str(cat->loglevel),
 			cat->enabled ? "Enabled" : "Disabled",

-- 
To view, visit https://gerrit.osmocom.org/1248
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieeba649c3bde6c9376d8e32b00b92beb37c08ef2
Gerrit-PatchSet: 2
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder