diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-17 19:47:47 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-17 19:47:47 +0000 |
| commit | a7ab1b165ef118678b71f4cffd79bebd07aa0b24 (patch) | |
| tree | abcd4810f52229ba3f3542996db799b81e8486be /main | |
| parent | 5116217796ca5b5a6c6fd393ef960c9b1c321144 (diff) | |
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.2@240720 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/pbx.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c index 372834d86..682bd81d3 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -3079,7 +3079,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); |