[asterisk-commits] dbrooks: branch 1.6.2 r229502 - in /branches/1.6.2: ./ main/pbx.c

[SVN commits to the Asterisk project]

Author: dbrooks
Date: Wed Nov 11 13:56:17 2009
New Revision: 229502

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=229502
Log:
Merged revisions 229499 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r229499 | dbrooks | 2009-11-11 13:48:18 -0600 (Wed, 11 Nov 2009) | 15 lines
  
  Merged revisions 229498 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r229498 | dbrooks | 2009-11-11 13:46:19 -0600 (Wed, 11 Nov 2009) | 8 lines
    
    Solaris doesn't like NULL going to ast_log
    
    Solaris will crash if NULL is passed to ast_log. This simple patch simply uses S_OR to
    get around this.
    
    (closes issue #15392)
    Reported by: yrashk
  ........
................

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

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

Modified: branches/1.6.2/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/pbx.c?view=diff&rev=229502&r1=229501&r2=229502
==============================================================================
--- branches/1.6.2/main/pbx.c (original)
+++ branches/1.6.2/main/pbx.c Wed Nov 11 13:56:17 2009
@@ -3722,22 +3722,23 @@
 		}
 	} else {	/* not found anywhere, see what happened */
 		ast_unlock_contexts();
+		/* Using S_OR here because Solaris doesn't like NULL being passed to ast_log */
 		switch (q.status) {
 		case STATUS_NO_CONTEXT:
 			if (!matching_action && !combined_find_spawn)
-				ast_log(LOG_NOTICE, "Cannot find extension context '%s'\n", context);
+				ast_log(LOG_NOTICE, "Cannot find extension context '%s'\n", S_OR(context, ""));
 			break;
 		case STATUS_NO_EXTENSION:
 			if (!matching_action && !combined_find_spawn)
-				ast_log(LOG_NOTICE, "Cannot find extension '%s' in context '%s'\n", exten, context);
+				ast_log(LOG_NOTICE, "Cannot find extension '%s' in context '%s'\n", exten, S_OR(context, ""));
 			break;
 		case STATUS_NO_PRIORITY:
 			if (!matching_action && !combined_find_spawn)
-				ast_log(LOG_NOTICE, "No such priority %d in extension '%s' in context '%s'\n", priority, exten, context);
+				ast_log(LOG_NOTICE, "No such priority %d in extension '%s' in context '%s'\n", priority, exten, S_OR(context, ""));
 			break;
 		case STATUS_NO_LABEL:
 			if (context && !combined_find_spawn)
-				ast_log(LOG_NOTICE, "No such label '%s' in extension '%s' in context '%s'\n", label, exten, context);
+				ast_log(LOG_NOTICE, "No such label '%s' in extension '%s' in context '%s'\n", label, exten, S_OR(context, ""));
 			break;
 		default:
 			ast_debug(1, "Shouldn't happen!\n");