From d4216edbf2af2d8347e5669dc73dd019a6ca95d0 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Tue, 17 Apr 2018 14:11:48 +0100 Subject: [PATCH] [Minor] Another attempt to fix path normalisation --- src/libutil/http.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/libutil/http.c b/src/libutil/http.c index a5133695b..03dbaa7bd 100644 --- a/src/libutil/http.c +++ b/src/libutil/http.c @@ -3780,12 +3780,9 @@ rspamd_http_normalize_path_inplace (gchar *path, guint len, guint *nlen) if (((o > path && *(o - 1) != '/') || (o == path)) && slash) { /* Preserve one slash */ *o++ = '/'; - slash = p; - } - else { - slash = NULL; } + slash = p; dot = NULL; /* Ignore last slash */ state = st_normal; @@ -3797,7 +3794,7 @@ rspamd_http_normalize_path_inplace (gchar *path, guint len, guint *nlen) else { /* We have something like .some or /.some */ if (dot && p > dot) { - if (slash == dot - 1) { + if (slash == dot - 1 && (o > path && *(o - 1) != '/')) { /* /.blah */ memmove (o, slash, p - slash); o += p - slash; -- 2.39.5