summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Brooks <dbrooks@digium.com>2009-11-11 19:48:18 +0000
committerDavid Brooks <dbrooks@digium.com>2009-11-11 19:48:18 +0000
commitbac499e521133d4c43b381b75477a3a1bf900803 (patch)
treea2fa1621ea21346d4a212ebb97688cf3bd40104f
parentc5990d41bbe95cade20e2b6a190fa1e18363f82c (diff)
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 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@229499 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--main/pbx.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/main/pbx.c b/main/pbx.c
index 30c988951..c347aeab2 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -4060,22 +4060,23 @@ static int pbx_extension_helper(struct ast_channel *c, struct ast_context *con,
}
} 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");