SHA256
1
0
forked from pool/vsftpd
Tomáš Chvátal 2015-03-23 20:59:56 +00:00 committed by Git OBS Bridge
parent fa040448aa
commit 915fc9626d

View File

@ -2,18 +2,15 @@ Index: vsftpd-3.0.2/ls.c
=================================================================== ===================================================================
--- vsftpd-3.0.2.orig/ls.c --- vsftpd-3.0.2.orig/ls.c
+++ vsftpd-3.0.2/ls.c +++ vsftpd-3.0.2/ls.c
@@ -121,7 +121,10 @@ vsf_ls_populate_dir_list(struct mystr_li @@ -270,6 +270,8 @@ vsf_filename_passes_filter(const struct
if (!str_isempty(p_filter_str)) }
} else
str_copy(&name_remain_str, p_filename_str);
+
+ str_normalize_filepath(&name_remain_str);
while (!str_isempty(&filter_remain_str) && *iters < VSFTP_MATCHITERS_MAX)
{ {
unsigned int iters = 0;
- if (!vsf_filename_passes_filter(&s_next_filename_str, p_filter_str,
+ struct mystr normalize_filename_str;
+ str_copy(&normalize_filename_str, &s_next_filename_str);
+ str_normalize_filepath(&normalize_filename_str);
+ if (!vsf_filename_passes_filter(&normalize_filename_str, p_filter_str,
&iters))
{
continue;
Index: vsftpd-3.0.2/str.c Index: vsftpd-3.0.2/str.c
=================================================================== ===================================================================
--- vsftpd-3.0.2.orig/str.c --- vsftpd-3.0.2.orig/str.c