summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--channels/chan_sip.c2
-rw-r--r--res/res_fax.c20
-rw-r--r--res/res_jabber.c2
3 files changed, 12 insertions, 12 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 08f655da9..7c57171b1 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -23768,7 +23768,7 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
if (!authpeer || AST_LIST_EMPTY(&authpeer->mailboxes)) {
transmit_response(p, "404 Not found (no mailbox)", req);
pvt_set_needdestroy(p, "received 404 response");
- ast_log(LOG_NOTICE, "Received SIP subscribe for peer without mailbox: %s\n", authpeer->name);
+ ast_log(LOG_NOTICE, "Received SIP subscribe for peer without mailbox: %s\n", S_OR(authpeer->name, ""));
if (authpeer)
unref_peer(authpeer, "unref_peer, from handle_request_subscribe (authpeer 4)");
return 0;
diff --git a/res/res_fax.c b/res/res_fax.c
index 785b073ae..ed718aeb6 100644
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -1717,11 +1717,11 @@ static int receivefax_exec(struct ast_channel *chan, const char *data)
info.context,
info.exten,
info.cid,
- pbx_builtin_getvar_helper(chan, "REMOTESTATIONID"),
- pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"),
- pbx_builtin_getvar_helper(chan, "FAXPAGES"),
- pbx_builtin_getvar_helper(chan, "FAXRESOLUTION"),
- pbx_builtin_getvar_helper(chan, "FAXBITRATE"),
+ S_OR(pbx_builtin_getvar_helper(chan, "REMOTESTATIONID"), ""),
+ S_OR(pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"), ""),
+ S_OR(pbx_builtin_getvar_helper(chan, "FAXPAGES"), ""),
+ S_OR(pbx_builtin_getvar_helper(chan, "FAXRESOLUTION"), ""),
+ S_OR(pbx_builtin_getvar_helper(chan, "FAXBITRATE"), ""),
args.filename);
ast_channel_unlock(chan);
@@ -2208,11 +2208,11 @@ static int sendfax_exec(struct ast_channel *chan, const char *data)
info.context,
info.exten,
info.cid,
- pbx_builtin_getvar_helper(chan, "REMOTESTATIONID"),
- pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"),
- pbx_builtin_getvar_helper(chan, "FAXPAGES"),
- pbx_builtin_getvar_helper(chan, "FAXRESOLUTION"),
- pbx_builtin_getvar_helper(chan, "FAXBITRATE"),
+ S_OR(pbx_builtin_getvar_helper(chan, "REMOTESTATIONID"), ""),
+ S_OR(pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"), ""),
+ S_OR(pbx_builtin_getvar_helper(chan, "FAXPAGES"), ""),
+ S_OR(pbx_builtin_getvar_helper(chan, "FAXRESOLUTION"), ""),
+ S_OR(pbx_builtin_getvar_helper(chan, "FAXBITRATE"), ""),
filenames);
ast_channel_unlock(chan);
diff --git a/res/res_jabber.c b/res/res_jabber.c
index 75ea729d1..951eb3edf 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -2490,7 +2490,7 @@ static void aji_handle_presence(struct aji_client *client, ikspak *pak)
"Account: %s\r\nJID: %s\r\nResource: %s\r\nStatus: %d\r\nPriority: %d"
"\r\nDescription: %s\r\n",
client->name, pak->from->partial, found->resource, found->status,
- found->priority, found->description);
+ found->priority, S_OR(found->description, ""));
} else {
manager_event(EVENT_FLAG_USER, "JabberStatus",
"Account: %s\r\nJID: %s\r\nStatus: %d\r\n",