aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xpbx.c3
-rwxr-xr-xres/res_agi.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/pbx.c b/pbx.c
index 4010411cc..26a3e021e 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 b6f6edebb..69133e7c4 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;