Revert 239927 and simplify a much more basic optimization

  to address if a basepath existed to compare the results to.
  Also reverts my attempt 382043 to fix the flaw.

  Any further 'features' to support alternate constructs of
  NOTABOVEROOT tested base and add paths must be brought up
  on list for discussion.

PR: 38801
Reported by: <kevin_wise motorola.com>


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@382095 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 11 insertions, 12 deletions

diff --git a/file_io/win32/filepath.c b/file_io/win32/filepath.c
index 8b7b32445..1912a1c80 100644
--- a/file_io/win32/filepath.c
+++ b/file_io/win32/filepath.c
@@ -800,18 +800,17 @@ APR_DECLARE(apr_status_t) apr_filepath_merge(char **newpath,
      * is still within given basepath.  Note that the root path 
      * segment is thoroughly tested prior to path parsing.
      */
-    if ((flags & APR_FILEPATH_NOTABOVEROOT) && (baselen || rootlen)) {
-        if (basepath[baselen - 1] != '/' && basepath[baselen - 1] != '\\') {
-            if (baselen && memcmp(basepath, path + rootlen, baselen))
-                return APR_EABOVEROOT;
-
-            /* Ahem... if we weren't given a trailing slash on the basepath,
-             * we better be sure that /foo wasn't replaced with /foobar!
-             */
-            if (path[rootlen + baselen] && path[rootlen + baselen] != '/' 
-                                        && path[rootlen + baselen] != '\\')
-                return APR_EABOVEROOT;
-        }
+    if ((flags & APR_FILEPATH_NOTABOVEROOT) && baselen) {
+        if (memcmp(basepath, path + rootlen, baselen) != 0)
+            return APR_EABOVEROOT;
+ 
+         /* Ahem... if we have a basepath without a trailing slash,
+          * we better be sure that /foo wasn't replaced with /foobar!
+          */
+        if (basepath[baselen - 1] != '/' && basepath[baselen - 1] != '\\'
+              && path[rootlen + baselen] && path[rootlen + baselen] != '/' 
+                                         && path[rootlen + baselen] != '\\')
+            return APR_EABOVEROOT;
     }
 
     if (addpath && (flags & APR_FILEPATH_TRUENAME)) {