From 8b8d26f9bc4996c725061a27e351698fd64cd825 Mon Sep 17 00:00:00 2001 From: James Golovich Date: Wed, 13 Oct 2004 22:47:42 +0000 Subject: [PATCH] Fix pbx_builtin_setlanguage to not seg when data is a NULL ptr. Also fix AGI so we dont run into this with other specific problems as well. (bug 2641) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3990 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- pbx.c | 3 ++- res/res_agi.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pbx.c b/pbx.c index 4010411cc8..26a3e021e6 100755 --- a/pbx.c +++ b/pbx.c @@ -4483,7 +4483,8 @@ static int pbx_builtin_answer(struct ast_channel *chan, void *data) static int pbx_builtin_setlanguage(struct ast_channel *chan, void *data) { /* Copy the language as specified */ - strncpy(chan->language, (char *)data, sizeof(chan->language)-1); + if (data) + strncpy(chan->language, (char *)data, sizeof(chan->language)-1); return 0; } diff --git a/res/res_agi.c b/res/res_agi.c index b6f6edebb8..69133e7c48 100755 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -827,7 +827,7 @@ static int handle_exec(struct ast_channel *chan, AGI *agi, int argc, char **argv app = pbx_findapp(argv[1]); if (app) { - res = pbx_exec(chan, app, argv[2], 1); + res = pbx_exec(chan, app, argv[2] ? argv[2] : NULL, 1); } else { ast_log(LOG_WARNING, "Could not find application (%s)\n", argv[1]); res = -2;