kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-10 03:48:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash in PresenceState AMI action when specifying an invalid provider

Browse Source 
This patch fixes a crash in Asterisk that could be caused by using the
PresenceState AMI action while providing an invalid provider. This patch
also adds some additional warnings when a user attempts to provide the
PresenceState action with invalid data, and removes some NOTICE statements
that were still lurking in the code from testing.

(closes issue AST-1084)
Reported by: John Bigelow
Tested by: John Bigelow


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@381594 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2013-02-15 23:23:49 +00:00
parent a70075ce10
commit 31d1bd4cd8
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
main/manager.c
View File

@@ -2248,6 +2248,7 @@ void astman_send_error_va(struct mansession *s, const struct message *m, const c
{
va_list ap;
struct ast_str *buf;
char *msg;
if (!(buf = ast_str_thread_get(&astman_append_buf, ASTMAN_APPEND_BUF_INITSIZE))) {
return;
@@ -2257,8 +2258,13 @@ void astman_send_error_va(struct mansession *s, const struct message *m, const c
ast_str_set_va(&buf, 0, fmt, ap);
va_end(ap);
astman_send_response_full(s, m, "Error", ast_str_buffer(buf), NULL);
ast_free(buf);
/* astman_append will use the same underlying buffer, so copy the message out
* before sending the response */
msg = ast_str_buffer(buf);
if (msg) {
msg = ast_strdupa(msg);
}
astman_send_response_full(s, m, "Error", msg, NULL);
}
void astman_send_ack(struct mansession *s, const struct message *m, char *msg)
@@ -3346,7 +3352,7 @@ static int action_hangup(struct mansession *s, const struct message *m)
/* if regex compilation fails, hangup fails */
if (regcomp(&regexbuf, ast_str_buffer(regex_string), REG_EXTENDED | REG_NOSUB)) {
astman_send_error_va(s, m, "Regex compile failed on: %s\n", name_or_regex);
astman_send_error_va(s, m, "Regex compile failed on: %s", name_or_regex);
ast_free(regex_string);
return 0;
}
@@ -4578,6 +4584,10 @@ static int action_presencestate(struct mansession *s, const struct message *m)
}
state = ast_presence_state(provider, &subtype, &message);
if (state == AST_PRESENCE_INVALID) {
astman_send_error_va(s, m, "Invalid provider %s or provider in invalid state", provider);
return 0;
}
if (!ast_strlen_zero(subtype)) {
snprintf(subtype_header, sizeof(subtype_header),