diff options
| author | Tavian Barnes <tavianator@tavianator.com> | 2024-03-20 16:56:46 -0400 |
|---|---|---|
| committer | Tavian Barnes <tavianator@tavianator.com> | 2024-03-20 16:56:46 -0400 |
| commit | 54490a29006529f7ceb4dc0514a075f9f4175621 (patch) | |
| tree | 2362a394bce4f8b2b2b51ed16f835a4aa7d9ffba | |
| parent | 745fd4be765407f7c56d61c281c28e2468ba25b5 (diff) | |
| download | bfs-54490a29006529f7ceb4dc0514a075f9f4175621.tar.xz | |
bfstd: Check that wcwidth() is positive
wcwidth() returns -1 for non-printable characters, but terminals
typically don't print anything for them, so treat them as 0.
| -rw-r--r-- | src/bfstd.c | 8 | ||||
| -rw-r--r-- | tests/bfstd.c | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/bfstd.c b/src/bfstd.c index c6c2e7f..5b64452 100644 --- a/src/bfstd.c +++ b/src/bfstd.c @@ -695,8 +695,12 @@ size_t xstrwidth(const char *str) { if (wc == WEOF) { // Assume a single-width '?' ++ret; - } else { - ret += xwcwidth(wc); + continue; + } + + int width = xwcwidth(wc); + if (width > 0) { + ret += width; } } diff --git a/tests/bfstd.c b/tests/bfstd.c index 26abdb6..1351e11 100644 --- a/tests/bfstd.c +++ b/tests/bfstd.c @@ -69,5 +69,8 @@ bool check_bfstd(void) { ret &= check_wordesc("\xF0\x9F\x98\x80", "\xF0\x9F\x98\x80", WESC_SHELL | WESC_TTY); } + ret &= bfs_check(xstrwidth("Hello world") == 11); + ret &= bfs_check(xstrwidth("Hello\1world") == 10); + return ret; } |