From e43d023e4130a80a673d56979ef38832ee34d5e0 Mon Sep 17 00:00:00 2001
From: seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Sun, 17 Jan 2010 19:47:45 +0000
Subject: Merged revisions 240717 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

........
  r240717 | seanbright | 2010-01-17 14:45:48 -0500 (Sun, 17 Jan 2010) | 5 lines

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

  (closes issue #16309)
  Reported by: asgaroth
........


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@240719 f38db490-d61c-443f-a65b-d21fe96a405b
---
 main/pbx.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'main')

diff --git a/main/pbx.c b/main/pbx.c
index 38af4deee..9dbe457e9 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -2688,7 +2688,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);
-- 
cgit v1.2.3