From b3d39349c9ac177b4640cd0e7d8a9a1e21be58e9 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 19 Jun 2024 02:31:30 +0200 Subject: [PATCH] mbsnlen: Fix bug (regression 2023-09-26). * lib/mbsnlen.c (mbsnlen): Fix bug in GNULIB_MCEL_PREFER implementation. --- ChangeLog | 5 +++++ lib/mbsnlen.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7e66ba5b11..fbde74072f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2024-06-18 Bruno Haible + + mbsnlen: Fix bug (regression 2023-09-26). + * lib/mbsnlen.c (mbsnlen): Fix bug in GNULIB_MCEL_PREFER implementation. + 2024-06-18 Bruno Haible mbslen: Add tests. diff --git a/lib/mbsnlen.c b/lib/mbsnlen.c index baadf163ca..1ce79bfb4b 100644 --- a/lib/mbsnlen.c +++ b/lib/mbsnlen.c @@ -40,7 +40,7 @@ mbsnlen (const char *string, size_t len) const char *string_end = string + len; #if GNULIB_MCEL_PREFER - for (; *string; string += mcel_scan (string, string_end).len) + for (; string < string_end; string += mcel_scan (string, string_end).len) count++; #else mbif_state_t state; -- 2.39.5