Sophie

Sophie

distrib > Mandriva > 2009.1 > i586 > media > main-release-src > by-pkgid > da3015ece393f3115e738ea4b0aa0efd > files > 9

apr-1.3.3-5mdv2009.1.src.rpm

Backport r712627 from the trunk.
Fix apr_tokenize_to_argv parsing.
PR 46128.
Patch by Edward Rudd <eddie omegaware.com>

Index: strings/apr_cpystrn.c
===================================================================
--- strings/apr_cpystrn.c	(revision 647686)
+++ strings/apr_cpystrn.c	(revision 712628)
@@ -114,8 +114,7 @@
  */
 #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; \