From fa4d6f23a60fcb35af3793baa4639becff171ce0 Mon Sep 17 00:00:00 2001 From: Luigi Rizzo Date: Tue, 24 Oct 2006 07:14:17 +0000 Subject: [PATCH] merge 46045 prevent NULL args to ast_strdupa() in chan_sip.c git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@46114 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index a67395b142..7060d4b2d2 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -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; }