Changeset fca4683

Timestamp:

2016-11-12T03:38:34Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

701ab812

Parents:

727a68b

Message:

word_wrap: truncate utf8 safely

Files:

• lib/misc.c (modified) (2 diffs)
• tests/check_util.c (modified) (1 diff)

lib/misc.c

@@ -549 +549 @@
 }
 
-/* Word wrapping. Yes, I know this isn't UTF-8 clean. I'm willing to take the risk. */
 char *word_wrap(const char *msg, int line_len)
 {
@@ -582 +581 @@
                 }
                 if (i == 0) {
-                        g_string_append_len(ret, msg, line_len);
+                        const char *end;
+                        size_t len;
+
+                        g_utf8_validate(msg, line_len, &end);
+
+                        len = (end != msg) ? end - msg : line_len;
+
+                        g_string_append_len(ret, msg, len);
                         g_string_append_c(ret, '\n');
-                        msg += line_len;
+                        msg += len;
                 }
         }

tests/check_util.c

@@ -137 +137 @@
                 5,
                 "aaaaa\naaaaa\naaaaa\naaaaa\naaaaa\naaaaa\naaaaa\na",
+        },
+        {
+                "áááááááááá",
+                11,
+                "ááááá\nááááá",
         },
         {