kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-06 14:52:38 -07:00
Code Issues Packages Projects Releases Wiki Activity

Unlike ast_strdup(), ast_strdupa() does not take a NULL pointer as argument,

Browse Source 
so fix the places where this might happen.

This is also a fix that ought to go into 1.4

[The difference between the two functions is a bit confusing,
and in asterisk i believe all string handling functions
should be able to handl a NULL string as argument,
but changing the API in trunk and not in 1.4 would make
backporting harder.]



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46045 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-10-23 21:46:15 +00:00
parent 6345c91eb3
commit a989f7cd47
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_sip.c
+8 -5
View File
@@ -1304,7 +1304,6 @@ static struct sip_auth *find_realm_authentication(struct sip_auth *authlist, con
static int sip_do_reload(enum channelreloadreason reason);
static int reload_config(enum channelreloadreason reason);
static int expire_register(void *data);
static int sip_sipredirect(struct sip_pvt *p, const char *dest);
static void *do_monitor(void *data);
static int restart_monitor(void);
static int sip_send_mwi_to_peer(struct sip_peer *peer);
@@ -1649,12 +1648,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);
@@ -3650,6 +3650,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 = "";
sip_pvt_lock(p);
if (ast->_state == AST_STATE_RING)
res = sip_sipredirect(p, dest);
@@ -15036,7 +15038,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;
@@ -16782,13 +16785,13 @@ static int sip_sipredirect(struct sip_pvt *p, const char *dest)
char *cdest;
char *extension, *host, *port;
char tmp[80];
cdest = ast_strdupa(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;
}