diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_calendar.c | 5 | ||||
| -rw-r--r-- | res/res_jabber.c | 4 | ||||
| -rw-r--r-- | res/res_mutestream.c | 5 | ||||
| -rw-r--r-- | res/res_pjsip_header_funcs.c | 4 | ||||
| -rw-r--r-- | res/res_xmpp.c | 4 |
5 files changed, 16 insertions, 6 deletions
diff --git a/res/res_calendar.c b/res/res_calendar.c index f279e73a0..e6c93fdc7 100644 --- a/res/res_calendar.c +++ b/res/res_calendar.c @@ -1685,6 +1685,11 @@ static int calendar_event_read(struct ast_channel *chan, const char *cmd, char * struct ast_datastore *datastore; struct ast_calendar_event *event; + if (!chan) { + ast_log(LOG_WARNING, "No channel was provided to %s function.\n", cmd); + return -1; + } + if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "%s requires an argument\n", cmd); return -1; diff --git a/res/res_jabber.c b/res/res_jabber.c index 41dd70c02..ede498124 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -845,7 +845,7 @@ static int acf_jabberreceive_read(struct ast_channel *chan, const char *name, ch start = ast_tvnow(); - if (ast_autoservice_start(chan) < 0) { + if (chan && ast_autoservice_start(chan) < 0) { ast_log(LOG_WARNING, "Cannot start autoservice for channel %s\n", ast_channel_name(chan)); ASTOBJ_UNREF(client, ast_aji_client_destroy); return -1; @@ -917,7 +917,7 @@ static int acf_jabberreceive_read(struct ast_channel *chan, const char *name, ch } ASTOBJ_UNREF(client, ast_aji_client_destroy); - if (ast_autoservice_stop(chan) < 0) { + if (chan && ast_autoservice_stop(chan) < 0) { ast_log(LOG_WARNING, "Cannot stop autoservice for channel %s\n", ast_channel_name(chan)); } diff --git a/res/res_mutestream.c b/res/res_mutestream.c index b907fbe3a..479b3d7ca 100644 --- a/res/res_mutestream.c +++ b/res/res_mutestream.c @@ -155,6 +155,11 @@ static int mute_channel(struct ast_channel *chan, const char *direction, int mut /*! \brief Mute dialplan function */ static int func_mute_write(struct ast_channel *chan, const char *cmd, char *data, const char *value) { + if (!chan) { + ast_log(LOG_WARNING, "No channel was provided to %s function.\n", cmd); + return -1; + } + return mute_channel(chan, data, ast_true(value)); } diff --git a/res/res_pjsip_header_funcs.c b/res/res_pjsip_header_funcs.c index 5d09d10c6..b5383fb32 100644 --- a/res/res_pjsip_header_funcs.c +++ b/res/res_pjsip_header_funcs.c @@ -444,7 +444,7 @@ static int remove_header(void *obj) static int func_read_header(struct ast_channel *chan, const char *function, char *data, char *buf, size_t len) { - struct ast_sip_channel_pvt *channel = ast_channel_tech_pvt(chan); + struct ast_sip_channel_pvt *channel = chan ? ast_channel_tech_pvt(chan) : NULL; struct header_data header_data; int number; AST_DECLARE_APP_ARGS(args, @@ -503,7 +503,7 @@ static int func_read_header(struct ast_channel *chan, const char *function, char static int func_write_header(struct ast_channel *chan, const char *cmd, char *data, const char *value) { - struct ast_sip_channel_pvt *channel = ast_channel_tech_pvt(chan); + struct ast_sip_channel_pvt *channel = chan ? ast_channel_tech_pvt(chan) : NULL; struct header_data header_data; int header_number; AST_DECLARE_APP_ARGS(args, diff --git a/res/res_xmpp.c b/res/res_xmpp.c index c067fdec4..fcdd2c4a8 100644 --- a/res/res_xmpp.c +++ b/res/res_xmpp.c @@ -2045,7 +2045,7 @@ static int acf_jabberreceive_read(struct ast_channel *chan, const char *name, ch start = ast_tvnow(); - if (ast_autoservice_start(chan) < 0) { + if (chan && ast_autoservice_start(chan) < 0) { ast_log(LOG_WARNING, "Cannot start autoservice for channel %s\n", ast_channel_name(chan)); return -1; } @@ -2117,7 +2117,7 @@ static int acf_jabberreceive_read(struct ast_channel *chan, const char *name, ch diff = ast_tvdiff_ms(ast_tvnow(), start); } - if (ast_autoservice_stop(chan) < 0) { + if (chan && ast_autoservice_stop(chan) < 0) { ast_log(LOG_WARNING, "Cannot stop autoservice for channel %s\n", ast_channel_name(chan)); } |