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

merge 46045 prevent NULL args to ast_strdupa() in chan_sip.c

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@46114 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-10-24 07:14:17 +00:00
parent 5cc4200696
commit fa4d6f23a6
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
channels/chan_sip.c
View File

@@ -1627,12 +1627,13 @@ static int find_sip_method(const char *msg)
static unsigned int parse_sip_options(struct sip_pvt *pvt, const char *supported)
{
char *next, *sep;
char *temp = ast_strdupa(supported);
char *temp;
unsigned int profile = 0;
int i, found;
if (ast_strlen_zero(supported) )
return 0;
temp = ast_strdupa(supported);
if (option_debug > 2 && sipdebug)
ast_log(LOG_DEBUG, "Begin: parsing SIP \"Supported: %s\"\n", supported);
@@ -3562,6 +3563,8 @@ static int sip_transfer(struct ast_channel *ast, const char *dest)
struct sip_pvt *p = ast->tech_pvt;
int res;
if (dest == NULL) /* functions below do not take a NULL */
dest = "";
ast_mutex_lock(&p->lock);
if (ast->_state == AST_STATE_RING)
res = sip_sipredirect(p, dest);
@@ -14848,7 +14851,8 @@ static int sip_devicestate(void *data)
int res = AST_DEVICE_INVALID;
host = ast_strdupa(data);
/* make sure data is not null. Maybe unnecessary, but better be safe */
host = ast_strdupa(data ? data : "");
if ((tmp = strchr(host, '@')))
host = tmp + 1;
@@ -16613,7 +16617,7 @@ static int sip_sipredirect(struct sip_pvt *p, const char *dest)
extension = strsep(&cdest, "@");
host = strsep(&cdest, ":");
port = strsep(&cdest, ":");
if (!extension) {
if (ast_strlen_zero(extension)) {
ast_log(LOG_ERROR, "Missing mandatory argument: extension\n");
return 0;
}