diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2005-11-10 23:18:03 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2005-11-10 23:18:03 +0000 |
commit | ff364c3068bb7907335c9a903a6cb59a670eff32 (patch) | |
tree | f982880a71656821fbbcc701db96d258d4da9a8b | |
parent | b124b6d6498d0ca9f4f9410553423ba245d2607e (diff) |
slight correction to options parsing
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7052 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rwxr-xr-x | ChangeLog | 4 | ||||
-rwxr-xr-x | app.c | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -1,10 +1,12 @@ 2005-11-10 Kevin P. Fleming <kpfleming@digium.com> + * app.c (ast_app_parse_options): don't increment 's' until after checking for NULL (related to issue #5630) + * apps/app_rpt.c: solve a memory leak (config structure was not freed) (issue #5706 2005-11-10 Russell Bryant <russell@digium.com> - * app.c (ast_app_separate_args): Don't consider the open parenthesis as part of the arguments to an option. + * app.c (ast_app_separate_args): Don't consider the open parenthesis as part of the arguments to an option. (issue #5630) * many files: Change all references to ast_separate_app_args to ast_app_separate_args * many files in apps/: Clean up some application descriptions. Make sure all descriptions in changed files are wrapped at 80 characters. @@ -1544,7 +1544,7 @@ int ast_app_parse_options(const struct ast_app_option *options, struct ast_flags if (*s == '(') { /* Has argument */ arg = ++s; - while (*++s && (*s != ')')); + while (*s && (*s++ != ')')); if (*s) { if (argloc) args[argloc - 1] = arg; |