Merge branch 'maint-2.34' into maint-2.35

1 files changed, 1 insertions, 1 deletions

diff --git a/column.c b/column.c
index 1261e18a72..fbf88639aa 100644
--- a/column.c
+++ b/column.c
@@ -23,7 +23,7 @@ struct column_data {
 /* return length of 's' in letters, ANSI escapes stripped */
 static int item_length(const char *s)
 {
-	return utf8_strnwidth(s, -1, 1);
+	return utf8_strnwidth(s, strlen(s), 1);
 }
 
 /*