8d113be502
- Readd seccomp disabled by default - vsftpd local_max_rate option doesn't work as expected - The vsftpd hangs in a SIGCHLD handler when the pam_exec.so is used in pam.d - configuration - The vsftpd doesn't remove failed upload when the delete_failed_uploads is - enabled and the network cable is unplagged - man pages bug - vsftpd segfaults in vsf_sysutil_strndup - Fix logging when syslog is used
26 lines
807 B
Diff
26 lines
807 B
Diff
From c7cbcc64c824d1a2a60f8d81c26d5c8215463623 Mon Sep 17 00:00:00 2001
|
|
From: Martin Sehnoutka <msehnout@redhat.com>
|
|
Date: Fri, 8 Apr 2016 15:05:06 +0200
|
|
Subject: [PATCH 6/7] vsftpd-2.2.2-blank-chars-overflow
|
|
|
|
---
|
|
str.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/str.c b/str.c
|
|
index 41b27db..82b8ae4 100644
|
|
--- a/str.c
|
|
+++ b/str.c
|
|
@@ -113,7 +113,7 @@ str_strdup_trimmed(const struct mystr* p_str)
|
|
for (h = 0; h < (int)str_getlen(p_str) && vsf_sysutil_isspace(p_trimmed[h]); h++) ;
|
|
for (t = str_getlen(p_str) - 1; t >= 0 && vsf_sysutil_isspace(p_trimmed[t]); t--) ;
|
|
newlen = t - h + 1;
|
|
- return newlen ? vsf_sysutil_strndup(p_trimmed+h, (unsigned int)newlen) : 0L;
|
|
+ return (newlen > 0) ? vsf_sysutil_strndup(p_trimmed+h, (unsigned int)newlen) : 0L;
|
|
}
|
|
|
|
void
|
|
--
|
|
2.5.5
|
|
|