From: Matthew Newton <mcn4@leicester.ac.uk>
Date: Thu, 17 Sep 2015 23:36:41 +0000 (+0100)
Subject: don't segfault when asked for help
X-Git-Tag: release_3_0_10~69^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1246%2Fhead;p=thirdparty%2Ffreeradius-server.git

don't segfault when asked for help

print the help for the current command if there are no subcommands
to list
---

diff --git a/src/main/command.c b/src/main/command.c
index 99fa117d950..099bb782596 100644
--- a/src/main/command.c
+++ b/src/main/command.c
@@ -2851,10 +2851,19 @@ static void print_help(rad_listen_t *listener, int argc, char *argv[],
 {
 	int i;
 
+	/* this should never happen, but if it does then just return gracefully */
+	if (!table) return;
+
 	for (i = 0; table[i].command != NULL; i++) {
 		if (argc > 0) {
 			if (strcmp(table[i].command, argv[0]) == 0) {
-				print_help(listener, argc - 1, argv + 1, table[i].table, recursive);
+				if (table[i].table) {
+					print_help(listener, argc - 1, argv + 1, table[i].table, recursive);
+				} else {
+					if (table[i].help) {
+						cprintf(listener, "%s\n", table[i].help);
+					}
+				}
 				return;
 			}