diff options
| -rw-r--r-- | rpmio/rpmfileutil.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/rpmio/rpmfileutil.c b/rpmio/rpmfileutil.c index 92685bc56..060d0c1d7 100644 --- a/rpmio/rpmfileutil.c +++ b/rpmio/rpmfileutil.c @@ -426,10 +426,18 @@ char *rpmCleanPath(char * path) if (begin && s[1] == '\0') { break; } - /* Trim embedded ./ , trailing /. */ - if ((t[-1] == '/' && s[1] == '\0') || (t > path && t[-1] == '/' && s[1] == '/')) { - s++; - continue; + /* Handle the ./ cases */ + if (t > path && t[-1] == '/') { + /* Trim embedded ./ */ + if (s[1] == '/') { + s+=2; + continue; + } + /* Trim trailing /. */ + if (s[1] == '\0') { + s++; + continue; + } } /* Trim embedded /../ and trailing /.. */ if (!begin && t > path && t[-1] == '/' && s[1] == '.' && (s[2] == '/' || s[2] == '\0')) { |