kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 11:42:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't loop forever on an invalid options string (issue #5629)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6989 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2005-11-06 22:17:47 +00:00
parent e4ce764744
commit bb3e125ed4
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -7,6 +7,7 @@
* many files: Add doxygen updates to categorize modules into groups. Convert a lot of comments over to doxygen style. Add some text giving a basic overview of channels. * many files: Add doxygen updates to categorize modules into groups. Convert a lot of comments over to doxygen style. Add some text giving a basic overview of channels.
* many files: Update applications to add an exit status variable, make priority jumping optional, and use new args parsing macros * many files: Update applications to add an exit status variable, make priority jumping optional, and use new args parsing macros
* pbx.c cdr.c res/res_features.c apps/app_dial.c include/asterisk/cdr.h: Convert some built-in applications to use new args parsing macros. Change ast_cdr_reset to take a pointer to an ast_flags structure instead of an integer for flags. * pbx.c cdr.c res/res_features.c apps/app_dial.c include/asterisk/cdr.h: Convert some built-in applications to use new args parsing macros. Change ast_cdr_reset to take a pointer to an ast_flags structure instead of an integer for flags.
* channels/chan_agent.c: Don't loop forever on an invalid options string
2005-11-05 Kevin P. Fleming <kpfleming@digium.com> 2005-11-05 Kevin P. Fleming <kpfleming@digium.com>

16
channels/chan_agent.c
View File

@@ -1658,13 +1658,12 @@ static struct ast_cli_entry cli_agent_logoff = {
STANDARD_LOCAL_USER; STANDARD_LOCAL_USER;
LOCAL_USER_DECL; LOCAL_USER_DECL;
/** /*!
* Log in agent application. * \brief Log in agent application.
* *
* @param chan * \param chan
* @param data * \param data
* @param callbackmode * \param callbackmode non-zero for AgentCallbackLogin
* @returns
*/ */
static int __login_exec(struct ast_channel *chan, void *data, int callbackmode) static int __login_exec(struct ast_channel *chan, void *data, int callbackmode)
{ {
@@ -1736,10 +1735,9 @@ static int __login_exec(struct ast_channel *chan, void *data, int callbackmode)
context = parse; context = parse;
} }
while (!ast_strlen_zero(args.options)) { if (!ast_strlen_zero(args.options)) {
if (*args.options == 's') { if (strchr(args.options, 's')) {
play_announcement = 0; play_announcement = 0;
break;
} }
} }