You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@apache.org on 2005/10/22 15:42:11 UTC
svn commit: r327661 - /apr/apr/branches/0.9.x/strings/apr_cpystrn.c
Author: trawick
Date: Sat Oct 22 06:42:08 2005
New Revision: 327661
URL: http://svn.apache.org/viewcvs?rev=327661&view=rev
Log:
merge from trunk:
apr_tokenize_to_argv(): Stop touching storage after the
end of the input string.
Modified:
apr/apr/branches/0.9.x/strings/apr_cpystrn.c
Modified: apr/apr/branches/0.9.x/strings/apr_cpystrn.c
URL: http://svn.apache.org/viewcvs/apr/apr/branches/0.9.x/strings/apr_cpystrn.c?rev=327661&r1=327660&r2=327661&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/strings/apr_cpystrn.c (original)
+++ apr/apr/branches/0.9.x/strings/apr_cpystrn.c Sat Oct 22 06:42:08 2005
@@ -169,6 +169,7 @@
/* determine first argument */
for (argnum = 0; argnum < (numargs-1); argnum++) {
+ SKIP_WHITESPACE(cp);
CHECK_QUOTATION(cp, isquoted);
ct = cp;
DETERMINE_NEXTSTRING(cp, isquoted);
@@ -177,7 +178,6 @@
apr_cpystrn((*argv_out)[argnum], ct, cp - ct);
cleaned = dirty = (*argv_out)[argnum];
REMOVE_ESCAPE_CHARS(cleaned, dirty, escaped);
- SKIP_WHITESPACE(cp);
}
(*argv_out)[argnum] = NULL;