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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@240719 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/pbx.c b/main/pbx.c
index 38af4deeee73b812bd39d8a62bc30c4cae235e01..9dbe457e935894c6988dc734e361a26647653c6e 100644 (file)
--- 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);