From: Sean Bright <sean@malleable.com>
Date: Sun, 17 Jan 2010 19:45:48 +0000 (+0000)
Subject: Avoid a crash on Solaris when running 'core show functions.'
X-Git-Tag: 11.0.0-beta1~3583
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e02292e5c4e333ebe1353caaa931b8c17d8b018;p=thirdparty%2Fasterisk.git

Avoid a crash on Solaris when running 'core show functions.'

(closes issue #16309)
Reported by: asgaroth


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@240717 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/pbx.c b/main/pbx.c
index 520e3365b5..d0ca80d465 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -3185,7 +3185,10 @@ static char *handle_show_functions(struct ast_cli_entry *e, int cmd, struct ast_
 	AST_RWLIST_TRAVERSE(&acf_root, acf, acflist) {
 		if (!like || strstr(acf->name, a->argv[4])) {
 			count_acf++;
-			ast_cli(a->fd, "%-20.20s  %-35.35s  %s\n", acf->name, acf->syntax, acf->synopsis);
+			ast_cli(a->fd, "%-20.20s  %-35.35s  %s\n",
+				S_OR(acf->name, ""),
+				S_OR(acf->syntax, ""),
+				S_OR(acf->synopsis, ""));
 		}
 	}
 	AST_RWLIST_UNLOCK(&acf_root);