summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-03-05 20:40:22 +0200
committerTor Lillqvist <tml@iki.fi>2012-03-05 20:55:27 +0200
commit921902ead77b7111a84678898e92fbdaf9e6f496 (patch)
tree05f5d6a8d52948835f98bf254bf9b9ada3660d5e
parent94d553b2fbff217861f150ba0583ea1dca35b30e (diff)
Handle consecutive slashes before ".."
-rw-r--r--solenv/bin/concat-deps.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index a667e0a43183..28ac2edb560b 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -692,6 +692,8 @@ static void _cancel_relative(char* base, char** ref_cursor, char** ref_cursor_ou
do
{
cursor += 3;
+ while(cursor_out > base && cursor_out[-1] == '/')
+ cursor_out--;
while(cursor_out > base && *--cursor_out != '/');
}
while(cursor + 3 < end && !memcmp(cursor, "/../", 4));