[svn-commits] seanbright: branch 1.6.0 r240718 - in /branches/1.6.0: ./ main/pbx.c

[SVN commits to the Digium repositories]

Author: seanbright
Date: Sun Jan 17 13:47:43 2010
New Revision: 240718

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=240718
Log:
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
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/pbx.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/pbx.c?view=diff&rev=240718&r1=240717&r2=240718
==============================================================================
--- branches/1.6.0/main/pbx.c (original)
+++ branches/1.6.0/main/pbx.c Sun Jan 17 13:47:43 2010
@@ -2607,7 +2607,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);