From 58818426d60d583c4becc6a99b398cbac1b7b12f Mon Sep 17 00:00:00 2001 From: russell Date: Wed, 19 Oct 2005 18:19:02 +0000 Subject: Massive cleanups to applications for LOCAL_USER handling and some other things. In general, LOCAL_USER_ADD/REMOVE should be the first/last thing called in an application. An exception is if there is some *fast* setup code that might halt the execution of the application, such as checking to see if an argument exists. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6832 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_url.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'apps/app_url.c') diff --git a/apps/app_url.c b/apps/app_url.c index 512ea9d9e..9f8a2badf 100755 --- a/apps/app_url.c +++ b/apps/app_url.c @@ -74,20 +74,29 @@ static int sendurl_exec(struct ast_channel *chan, void *data) { int res = 0; struct localuser *u; - char tmp[256]; + char *tmp; char *options; int local_option_wait=0; int local_option_jump = 0; struct ast_frame *f; char *stringp=NULL; char *status = "FAILURE"; - - if (!data || !strlen((char *)data)) { + + if (!data || ast_strlen_zero(data)) { ast_log(LOG_WARNING, "SendURL requires an argument (URL)\n"); pbx_builtin_setvar_helper(chan, "SENDURLSTATUS", status); return -1; } - strncpy(tmp, (char *)data, sizeof(tmp)-1); + + LOCAL_USER_ADD(u); + + tmp = ast_strdupa(data); + if (!tmp) { + ast_log(LOG_ERROR, "Out of memory\n"); + LOCAL_USER_REMOVE(u); + return -1; + } + stringp=tmp; strsep(&stringp, "|"); options = strsep(&stringp, "|"); @@ -95,7 +104,7 @@ static int sendurl_exec(struct ast_channel *chan, void *data) local_option_wait = 1; if (options && !strcasecmp(options, "j")) local_option_jump = 1; - LOCAL_USER_ADD(u); + if (!ast_channel_supports_html(chan)) { /* Does not support transport */ if (local_option_jump || option_priority_jumping) -- cgit v1.2.3