1*4882a593SmuzhiyunFrom 36c6d268cb190282a2c17106acfd31863121b58e Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Frank Denis <github@pureftpd.org> 3*4882a593SmuzhiyunDate: Mon, 24 Feb 2020 15:19:43 +0100 4*4882a593SmuzhiyunSubject: [PATCH] pure_strcmp(): len(s2) can be > len(s1) 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunReported by Antonio Morales from GitHub Security Labs, thanks! 7*4882a593Smuzhiyun[Retrieved from: 8*4882a593Smuzhiyunhttps://github.com/jedisct1/pure-ftpd/commit/36c6d268cb190282a2c17106acfd31863121b] 9*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 10*4882a593Smuzhiyun--- 11*4882a593Smuzhiyun src/utils.c | 8 +++++++- 12*4882a593Smuzhiyun 1 file changed, 7 insertions(+), 1 deletion(-) 13*4882a593Smuzhiyun 14*4882a593Smuzhiyundiff --git a/src/utils.c b/src/utils.c 15*4882a593Smuzhiyunindex f41492d..a7f0381 100644 16*4882a593Smuzhiyun--- a/src/utils.c 17*4882a593Smuzhiyun+++ b/src/utils.c 18*4882a593Smuzhiyun@@ -45,5 +45,11 @@ int pure_memcmp(const void * const b1_, const void * const b2_, size_t len) 19*4882a593Smuzhiyun 20*4882a593Smuzhiyun int pure_strcmp(const char * const s1, const char * const s2) 21*4882a593Smuzhiyun { 22*4882a593Smuzhiyun- return pure_memcmp(s1, s2, strlen(s1) + 1U); 23*4882a593Smuzhiyun+ const size_t s1_len = strlen(s1); 24*4882a593Smuzhiyun+ const size_t s2_len = strlen(s2); 25*4882a593Smuzhiyun+ 26*4882a593Smuzhiyun+ if (s1_len != s2_len) { 27*4882a593Smuzhiyun+ return -1; 28*4882a593Smuzhiyun+ } 29*4882a593Smuzhiyun+ return pure_memcmp(s1, s2, s1_len); 30*4882a593Smuzhiyun } 31