From cec0e915ee24e81e6539a650f0511a3d7a753fc1 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Fri, 20 Jun 2008 22:06:01 +0000 Subject: [PATCH] Merged revisions 124396 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r124396 | tilghman | 2008-06-20 17:04:37 -0500 (Fri, 20 Jun 2008) | 11 lines Merged revisions 124395 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r124395 | tilghman | 2008-06-20 17:02:55 -0500 (Fri, 20 Jun 2008) | 3 lines If the last character in a string to be parsed is the delimiter, then we should count that final empty string as an additional argument. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@124397 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/app.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/main/app.c b/main/app.c index 725bd14463..c0c9c0309f 100644 --- a/main/app.c +++ b/main/app.c @@ -1012,7 +1012,7 @@ int ast_app_group_list_unlock(void) unsigned int ast_app_separate_args(char *buf, char delim, char **array, int arraylen) { int argc; - char *scan; + char *scan, *wasdelim = NULL; int paren = 0, quote = 0; if (!buf || !array || !arraylen) @@ -1039,14 +1039,18 @@ unsigned int ast_app_separate_args(char *buf, char delim, char **array, int arra /* Literal character, don't parse */ memmove(scan, scan + 1, strlen(scan)); } else if ((*scan == delim) && !paren && !quote) { + wasdelim = scan; *scan++ = '\0'; break; } } } - if (*scan) + /* If the last character in the original string was the delimiter, then + * there is one additional argument. */ + if (*scan || (scan > buf && (scan - 1) == wasdelim)) { array[argc++] = scan; + } return argc; }