[asterisk-commits] seanbright: trunk r240717 - /trunk/main/pbx.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Sun Jan 17 13:45:48 2010
New Revision: 240717

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=240717
Log:
Avoid a crash on Solaris when running 'core show functions.'

(closes issue #16309)
Reported by: asgaroth

Modified:
    trunk/main/pbx.c

Modified: trunk/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/pbx.c?view=diff&rev=240717&r1=240716&r2=240717
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Sun Jan 17 13:45:48 2010
@@ -3185,7 +3185,10 @@
 	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);