From b14bdc5a1211fa53add7d87b9444b56576d6d2d8 Mon Sep 17 00:00:00 2001 From: russell Date: Sat, 21 Jan 2006 17:50:04 +0000 Subject: revert my pass through the tree to remove checks of the result of ast_strdupa (revisions 8378 through 8381) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@8387 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_exec.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) (limited to 'apps/app_exec.c') diff --git a/apps/app_exec.c b/apps/app_exec.c index b2a45dc93..9759455ac 100644 --- a/apps/app_exec.c +++ b/apps/app_exec.c @@ -73,22 +73,27 @@ static int exec_exec(struct ast_channel *chan, void *data) /* Check and parse arguments */ if (data) { - s = ast_strdupa(data); - appname = strsep(&s, "("); + s = ast_strdupa((char *)data); if (s) { - endargs = strrchr(s, ')'); - if (endargs) - *endargs = '\0'; - pbx_substitute_variables_helper(chan, s, args, MAXRESULT - 1); - } - if (appname) { - app = pbx_findapp(appname); - if (app) { - res = pbx_exec(chan, app, args, 1); - } else { - ast_log(LOG_WARNING, "Could not find application (%s)\n", appname); - res = -1; + appname = strsep(&s, "("); + if (s) { + endargs = strrchr(s, ')'); + if (endargs) + *endargs = '\0'; + pbx_substitute_variables_helper(chan, s, args, MAXRESULT - 1); + } + if (appname) { + app = pbx_findapp(appname); + if (app) { + res = pbx_exec(chan, app, args, 1); + } else { + ast_log(LOG_WARNING, "Could not find application (%s)\n", appname); + res = -1; + } } + } else { + ast_log(LOG_ERROR, "Out of memory\n"); + res = -1; } } -- cgit v1.2.3