kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-26 14:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes sip crash when calling remove_uri_parameters with NULL

Browse Source 
AST-2011-009

(closes issue ASTERISK-18017)
Reported by: jaredmauch



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@324685 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2011-06-23 18:31:00 +00:00
parent 1e7ff89467
commit 5a8af0d613
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
channels/sip/reqresp_parser.c
View File

@@ -1029,14 +1029,14 @@ int get_in_brackets_full(char *tmp,char **out,char **residue)
only affects token based display-names there is no danger of brackets being in quotes */ only affects token based display-names there is no danger of brackets being in quotes */
if (first_bracket) { if (first_bracket) {
parse = first_bracket; parse = first_bracket;
} else { } else {
parse = tmp; parse = tmp;
} }
if ((second_bracket = strchr(parse, '>'))) { if ((second_bracket = strchr(parse, '>'))) {
*second_bracket++ = '\0'; *second_bracket++ = '\0';
if (out) { if (out) {
*out = first_bracket; *out = (char *) parse;
} }
if (residue) { if (residue) {
*residue = second_bracket; *residue = second_bracket;
@@ -1045,9 +1045,9 @@ int get_in_brackets_full(char *tmp,char **out,char **residue)
} }
if ((first_bracket)) { if ((first_bracket)) {
ast_log(LOG_WARNING, "No closing bracket found in '%s'\n", tmp); ast_log(LOG_WARNING, "No closing bracket found in '%s'\n", tmp);
return -1; return -1;
} }
if (out) { if (out) {
*out = tmp; *out = tmp;
@@ -1076,6 +1076,7 @@ AST_TEST_DEFINE(get_in_brackets_test)
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 no_name_no_brackets[] = "sip:name@host";
char missing_start_bracket[] = "name not in quotes sip:name:secret@host:port;transport=tcp?headers=testblah&headers2=blahblah>";
char *uri = NULL; char *uri = NULL;
switch (cmd) { switch (cmd) {
@@ -1140,6 +1141,13 @@ AST_TEST_DEFINE(get_in_brackets_test)
res = AST_TEST_FAIL; res = AST_TEST_FAIL;
} }
/* Test 8, no start bracket, but with ending bracket. */
if (!(uri = get_in_brackets(missing_start_bracket)) || !(strcmp(uri, in_brackets))) {
ast_test_status_update(test, "Test 8 failed. %s\n", uri);
res = AST_TEST_FAIL;
}
return res; return res;
} }