kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 11:58:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes crash when From header URI is missing "sip:"

Browse Source 
(closes issue #17437)
Reported by: klaus3000
Patches:
      sip_crash uploaded by dvossel (license 671)
Tested by: klaus3000



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@271553 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2010-06-21 20:46:22 +00:00
parent 1a7e1aee5e
commit 462da0585e
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_sip.c
View File

@@ -14445,8 +14445,8 @@ static enum check_auth_result check_user_full(struct sip_pvt *p, struct sip_requ
struct sockaddr_in *sin, struct sip_peer **authpeer) struct sockaddr_in *sin, struct sip_peer **authpeer)
{ {
char from[256] = { 0, }; char from[256] = { 0, };
char *dummy; /* dummy return value for parse_uri */ char *dummy = NULL; /* dummy return value for parse_uri */
char *domain; /* dummy return value for parse_uri */ char *domain = NULL; /* dummy return value for parse_uri */
char *of; char *of;
enum check_auth_result res = AUTH_DONT_KNOW; enum check_auth_result res = AUTH_DONT_KNOW;
char calleridname[50]; char calleridname[50];

22
channels/sip/reqresp_parser.c
View File

@@ -759,6 +759,11 @@ const char *get_calleridname(const char *input, char *output, size_t outputsize)
} }
} }
if (*input != '<') { /* if we never found the start of addr-spec then this is invalid */
*orig_output = '\0';
return orig_input;
}
/* set NULL while trimming trailing whitespace */ /* set NULL while trimming trailing whitespace */
do { do {
*output-- = '\0'; *output-- = '\0';
@@ -776,6 +781,7 @@ AST_TEST_DEFINE(get_calleridname_test)
const char *overflow1 = " \"quoted-text overflow 1234567890123456789012345678901234567890\" <stuff>"; const char *overflow1 = " \"quoted-text overflow 1234567890123456789012345678901234567890\" <stuff>";
const char *noendquote = " \"quoted-text no end <stuff>"; const char *noendquote = " \"quoted-text no end <stuff>";
const char *addrspec = " \"sip:blah@blah <stuff>"; const char *addrspec = " \"sip:blah@blah <stuff>";
const char *no_quotes_no_brackets = "blah@blah";
const char *after_dname; const char *after_dname;
char dname[40]; char dname[40];
@@ -830,6 +836,15 @@ AST_TEST_DEFINE(get_calleridname_test)
res = AST_TEST_FAIL; res = AST_TEST_FAIL;
} }
/* no quotes, no brackets */
after_dname = get_calleridname(no_quotes_no_brackets, dname, sizeof(dname));
ast_test_status_update(test, "no_quotes_no_brackets display-name1: %s\nafter: %s\n", dname, after_dname);
if (*dname != '\0' && after_dname != no_quotes_no_brackets) {
ast_test_status_update(test, "detection of addr-spec failed\n");
res = AST_TEST_FAIL;
}
return res; return res;
} }
@@ -1065,6 +1080,7 @@ AST_TEST_DEFINE(get_in_brackets_test)
char missing_end_quote[] = "\"I'm a quote string <sip:name:secret@host:port;transport=tcp?headers=testblah&headers2=blahblah>"; char missing_end_quote[] = "\"I'm a quote string <sip:name:secret@host:port;transport=tcp?headers=testblah&headers2=blahblah>";
char name_no_quotes[] = "name not in quotes <sip:name:secret@host:port;transport=tcp?headers=testblah&headers2=blahblah>"; char name_no_quotes[] = "name not in quotes <sip:name:secret@host:port;transport=tcp?headers=testblah&headers2=blahblah>";
char no_end_bracket[] = "name not in quotes <sip:name:secret@host:port;transport=tcp?headers=testblah&headers2=blahblah"; char no_end_bracket[] = "name not in quotes <sip:name:secret@host:port;transport=tcp?headers=testblah&headers2=blahblah";
char no_name_no_brackets[] = "sip:name@host";
char *uri = NULL; char *uri = NULL;
switch (cmd) { switch (cmd) {
@@ -1122,6 +1138,12 @@ AST_TEST_DEFINE(get_in_brackets_test)
res = AST_TEST_FAIL; res = AST_TEST_FAIL;
} }
/* Test 7, no name, and no brackets. */
if (!(uri = get_in_brackets(no_name_no_brackets)) || (strcmp(uri, "sip:name@host"))) {
ast_test_status_update(test, "Test 7 failed. %s\n", uri);
res = AST_TEST_FAIL;
}
return res; return res;
} }