From 36c6d268cb190282a2c17106acfd31863121b58e Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 24 Feb 2020 15:19:43 +0100 Subject: [PATCH] pure_strcmp(): len(s2) can be > len(s1) Reported by Antonio Morales from GitHub Security Labs, thanks! [Retrieved from: https://github.com/jedisct1/pure-ftpd/commit/36c6d268cb190282a2c17106acfd31863121b] Signed-off-by: Fabrice Fontaine --- src/utils.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/utils.c b/src/utils.c index f41492d..a7f0381 100644 --- a/src/utils.c +++ b/src/utils.c @@ -45,5 +45,11 @@ int pure_memcmp(const void * const b1_, const void * const b2_, size_t len) int pure_strcmp(const char * const s1, const char * const s2) { - return pure_memcmp(s1, s2, strlen(s1) + 1U); + const size_t s1_len = strlen(s1); + const size_t s2_len = strlen(s2); + + if (s1_len != s2_len) { + return -1; + } + return pure_memcmp(s1, s2, s1_len); }