diff options
| -rw-r--r-- | src/commonlib/bsd/string.c | 10 | ||||
| -rw-r--r-- | tests/commonlib/bsd/string-test.c | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/commonlib/bsd/string.c b/src/commonlib/bsd/string.c index 16cd4b5e1d..56670e8862 100644 --- a/src/commonlib/bsd/string.c +++ b/src/commonlib/bsd/string.c @@ -15,12 +15,10 @@ size_t strlen(const char *str) size_t strnlen(const char *str, size_t maxlen) { - const char *ptr = str; - const char *end = str + maxlen + 1; - - while (*ptr++ && ptr < end) - ; - return ptr - str - 1; + size_t len = 0; + while (*str++ && len < maxlen) + len++; + return len; } char *strcat(char *dst, const char *src) diff --git a/tests/commonlib/bsd/string-test.c b/tests/commonlib/bsd/string-test.c index 37419f049d..194177abbb 100644 --- a/tests/commonlib/bsd/string-test.c +++ b/tests/commonlib/bsd/string-test.c @@ -23,6 +23,9 @@ static void test_strlen(void **state) static void test_strnlen(void **state) { + /* maxlen is SIZE_MAX */ + assert_int_equal(8, strnlen("coreboot", SIZE_MAX)); + /* maxlen larger than string len */ assert_int_equal(8, strnlen("coreboot", 100)); |