kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-28 23:15:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build problem with dev mode enabled, which was caused by commit 321100. Reformulated patch to be more generic.

Browse Source 
Moved the sip uri parse variable initalization to parse_uri_full in reqresp_parser.c.  This will ensure that any use of parse uri will have null output variables if the parse fails.

(closes issue #19346)
Reported by: kobaz
Tested by: kobaz,JonathanRose

Review: [full review board URL with trailing slash]


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@321155 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Murawki
2011-05-26 21:48:45 +00:00
parent d21c41b26a
commit a35ebe0f61
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
channels/chan_sip.c
View File

@@ -13287,21 +13287,8 @@ static int parse_ok_contact(struct sip_pvt *pvt, struct sip_request *req)
}
/*! \brief parse uri in a way that allows semicolon stripping if legacy mode is enabled */
static int parse_uri_legacy_check(char *uri, const char *scheme, char **user, char **pass, char **domain, char **transport) {
/* Assume invalid to start */
if (user) {
*user = 0;
}
if (pass) {
*pass = 0;
}
if (domain) {
*domain = 0;
}
if (transport) {
*transport = 0;
}
static int parse_uri_legacy_check(char *uri, const char *scheme, char **user, char **pass, char **domain, char **transport)
{
int ret = parse_uri(uri, scheme, user, pass, domain, transport);
if (sip_cfg.legacy_useroption_parsing) { /* if legacy mode is active, strip semis from the user field */
char *p;