kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_pjsip_dtmf_info: NULL terminate the message body.

Browse Source 
PJSIP does not ensure that when printing the message body the
buffer will be NULL terminated. This is problematic when searching
for the signal and duration values of the DTMF.

This change ensures the buffer is always NULL terminated.

Change-Id: I52653a1a60c93092d06af31a27408d569cc98968
This commit is contained in:
Joshua Colp
2016-03-03 10:26:10 -04:00
parent b78ec68c39
commit 6af7fc4c37
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/res_pjsip_dtmf_info.c
View File

@@ -82,14 +82,13 @@ static char get_event(const char *c)
static int dtmf_info_incoming_request(struct ast_sip_session *session, struct pjsip_rx_data *rdata) static int dtmf_info_incoming_request(struct ast_sip_session *session, struct pjsip_rx_data *rdata)
{ {
pjsip_msg_body *body = rdata->msg_info.msg->body; pjsip_msg_body *body = rdata->msg_info.msg->body;
char buf[body ? body->len : 0]; char buf[body ? body->len + 1 : 1];
char *cur = buf; char *cur = buf;
char *line; char *line;
char event = '\0'; char event = '\0';
unsigned int duration = 100; unsigned int duration = 100;
char is_dtmf; char is_dtmf;
int res;
if (!session->channel) { if (!session->channel) {
return 0; return 0;
@@ -107,7 +106,12 @@ static int dtmf_info_incoming_request(struct ast_sip_session *session, struct pj
return 0; return 0;
} }
body->print_body(body, buf, body->len); res = body->print_body(body, buf, body->len);
if (res < 0) {
send_response(session, rdata, 500);
return 0;
}
buf[res] = '\0';
if (is_dtmf) { if (is_dtmf) {
/* directly use what is in the message body */ /* directly use what is in the message body */