mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-02 19:16:15 +00:00
Merged revisions 61681 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r61681 | tilghman | 2007-04-18 21:45:05 -0500 (Wed, 18 Apr 2007) | 13 lines 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/trunk@61682 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -46,6 +46,9 @@ static int timeout_read(struct ast_channel *chan, const char *cmd, char *data,
|
||||
{
|
||||
time_t myt;
|
||||
|
||||
if (!chan)
|
||||
return -1;
|
||||
|
||||
if (!data) {
|
||||
ast_log(LOG_ERROR, "Must specify type of timeout to get.\n");
|
||||
return -1;
|
||||
@@ -91,6 +94,9 @@ static int timeout_write(struct ast_channel *chan, const char *cmd, char *data,
|
||||
char timestr[64];
|
||||
struct tm myt;
|
||||
|
||||
if (!chan)
|
||||
return -1;
|
||||
|
||||
if (!data) {
|
||||
ast_log(LOG_ERROR, "Must specify type of timeout to set.\n");
|
||||
return -1;
|
||||
|
Reference in New Issue
Block a user