diff options
| author | David Vossel <dvossel@digium.com> | 2011-06-23 18:31:42 +0000 |
|---|---|---|
| committer | David Vossel <dvossel@digium.com> | 2011-06-23 18:31:42 +0000 |
| commit | 6693c49a6a4532478dbf838ed6a169558652b50a (patch) | |
| tree | 4aaa3eabf1ea3ea338f3781c40f3dd76f2bde557 /channels/sip | |
| parent | d5ea9e5ae2156717076fc6d53b572a4844819624 (diff) | |
Merged revisions 324685 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r324685 | dvossel | 2011-06-23 13:31:00 -0500 (Thu, 23 Jun 2011) | 8 lines
Fixes sip crash when calling remove_uri_parameters with NULL
AST-2011-009
(closes issue ASTERISK-18017)
Reported by: jaredmauch
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@324689 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/sip')
| -rw-r--r-- | channels/sip/reqresp_parser.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/channels/sip/reqresp_parser.c b/channels/sip/reqresp_parser.c index 6c7031730..37d77d418 100644 --- a/channels/sip/reqresp_parser.c +++ b/channels/sip/reqresp_parser.c @@ -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 */ if (first_bracket) { parse = first_bracket; - } else { + } else { parse = tmp; } if ((second_bracket = strchr(parse, '>'))) { *second_bracket++ = '\0'; if (out) { - *out = first_bracket; + *out = (char *) parse; } if (residue) { *residue = second_bracket; @@ -1045,9 +1045,9 @@ int get_in_brackets_full(char *tmp,char **out,char **residue) } 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; - } + } if (out) { *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 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 missing_start_bracket[] = "name not in quotes sip:name:secret@host:port;transport=tcp?headers=testblah&headers2=blahblah>"; char *uri = NULL; switch (cmd) { @@ -1140,6 +1141,13 @@ AST_TEST_DEFINE(get_in_brackets_test) 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; } |