From: Karel Zak <kzak@redhat.com>
Date: Mon, 28 May 2018 10:30:34 +0000 (+0200)
Subject: lib/strutils: fix strnlen() fallback
X-Git-Tag: v2.33-rc1~242
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64af1a29871e116ebf825fe8d4dbf1c1c73ce4a8;p=thirdparty%2Futil-linux.git

lib/strutils: fix strnlen() fallback

Addresses: https://github.com/karelzak/util-linux/issues/643
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/lib/strutils.c b/lib/strutils.c
index 74d2e5aa9c..c3c4222165 100644
--- a/lib/strutils.c
+++ b/lib/strutils.c
@@ -243,11 +243,11 @@ void *mempcpy(void *restrict dest, const void *restrict src, size_t n)
 #ifndef HAVE_STRNLEN
 size_t strnlen(const char *s, size_t maxlen)
 {
-        int i;
+        size_t i;
 
         for (i = 0; i < maxlen; i++) {
                 if (s[i] == '\0')
-                        return i + 1;
+                        return i;
         }
         return maxlen;
 }