From 59f878fa3d175b2d085a01a8df786c9e40be14b9 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 4 May 2023 23:22:14 +0200 Subject: wcswidth: Fix result in case of overflow. * lib/wcswidth-impl.h (wcswidth): Continue searching for a non-printing wide character after the total width has become > INT_MAX. --- ChangeLog | 6 ++++++ lib/wcswidth-impl.h | 19 ++++++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d41aa0bb28..af99e65a65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2023-05-04 Bruno Haible + + wcswidth: Fix result in case of overflow. + * lib/wcswidth-impl.h (wcswidth): Continue searching for a non-printing + wide character after the total width has become > INT_MAX. + 2023-05-04 Bruno Haible wcswidth: Relax license. diff --git a/lib/wcswidth-impl.h b/lib/wcswidth-impl.h index 644a093a7e..a879bfdd93 100644 --- a/lib/wcswidth-impl.h +++ b/lib/wcswidth-impl.h @@ -35,9 +35,22 @@ wcswidth (const wchar_t *s, size_t n) } return count; + /* The total width has become > INT_MAX. + Continue searching for a non-printing wide character. */ + for (; n > 0; s++, n--) + { + wchar_t c = *s; + if (c == (wchar_t)'\0') + break; + { + int width = wcwidth (c); + if (width < 0) + goto found_nonprinting; + } + overflow: ; + } + return INT_MAX; + found_nonprinting: return -1; - - overflow: - return INT_MAX; } -- cgit v1.2.1