Merged revisions 61680 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r61680 | tilghman | 2007-04-18 21:30:18 -0500 (Wed, 18 Apr 2007) | 5 lines

Bug 9557 - Specifying the GetVar AMI action without a Channel parameter can
cause Asterisk to crash.  The reason this needs to be fixed in the functions
instead of in AMI is because Channel can legitimately be NULL, such as when
retrieving global variables.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@61681 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2007-04-19 02:45:05 +00:00
parent b823c62709
commit 1572777fa0
6 changed files with 20 additions and 8 deletions

View File

@@ -48,7 +48,7 @@ static int language_read(struct ast_channel *chan, char *cmd, char *data,
"LANGUAGE() is deprecated; use CHANNEL(language) instead.\n");
}
ast_copy_string(buf, chan->language, len);
ast_copy_string(buf, chan ? chan->language : "", len);
return 0;
}
@@ -62,7 +62,7 @@ static int language_write(struct ast_channel *chan, char *cmd, char *data,
"LANGUAGE() is deprecated; use CHANNEL(language) instead.\n");
}
if (value)
if (chan && value)
ast_string_field_set(chan, language, value);
return 0;