mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-06 12:36:58 +00:00
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
This commit is contained in:
1
pbx.c
1
pbx.c
@@ -4483,6 +4483,7 @@ 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 */
|
||||
if (data)
|
||||
strncpy(chan->language, (char *)data, sizeof(chan->language)-1);
|
||||
return 0;
|
||||
}
|
||||
|
@@ -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;
|
||||
|
Reference in New Issue
Block a user