diff options
| author | bojan <bojan@13f79535-47bb-0310-9956-ffa450edef68> | 2008-11-10 08:49:22 +0000 |
|---|---|---|
| committer | bojan <bojan@13f79535-47bb-0310-9956-ffa450edef68> | 2008-11-10 08:49:22 +0000 |
| commit | e36a9d06751822b73de216207f5b31530aa16eee (patch) | |
| tree | 7e3ce5aed2136c1a11b8bd4a0f3bcb9c01361935 /strings | |
| parent | 96b723c4da5abad42497320e7a5af5d64e41d343 (diff) | |
| download | libapr-e36a9d06751822b73de216207f5b31530aa16eee.tar.gz | |
Backport r712627 from the trunk.
Fix apr_tokenize_to_argv parsing.
PR 46128.
Patch by Edward Rudd <eddie omegaware.com>
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.3.x@712628 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/apr_cpystrn.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/strings/apr_cpystrn.c b/strings/apr_cpystrn.c index 888b2e5db..6311c29f3 100644 --- a/strings/apr_cpystrn.c +++ b/strings/apr_cpystrn.c @@ -114,8 +114,7 @@ APR_DECLARE(apr_status_t) apr_tokenize_to_argv(const char *arg_str, */ #define DETERMINE_NEXTSTRING(cp,isquoted) \ for ( ; *cp != '\0'; cp++) { \ - if ( (isquoted && (*cp == ' ' || *cp == '\t')) \ - || (*cp == '\\' && (*(cp+1) == ' ' || *(cp+1) == '\t' || \ + if ( (*cp == '\\' && (*(cp+1) == ' ' || *(cp+1) == '\t' || \ *(cp+1) == '"' || *(cp+1) == '\''))) { \ cp++; \ continue; \ |