Made UTF-8 stuff more robust.

1 files changed, 4 insertions, 2 deletions

diff --git a/test/unicode_test.cc b/test/unicode_test.cc
index 7ce1da0a..31ede6ba 100644
--- a/test/unicode_test.cc
+++ b/test/unicode_test.cc
@@ -26,12 +26,14 @@ int main (int argc, char *argv[])
 
    puts ("===== misc::unicode, not 0-terminated =====");
    for (const char *s = t2; s; s = nextUtf8Char (s, t2len - (s - t2)))
-      printf ("%3d -> U+%04x\n", (int)(s - t2), decodeUtf8(s));
+      printf ("%3d -> U+%04x\n", (int)(s - t2),
+              decodeUtf8(s, t2len - (s - t2)));
 
    puts ("===== Fltk, not 0-terminated =====");
    for (const char *s = t2; *s;
         s - t2 < t2len && (s = fl_utf8fwd (s + 1, t2, t2 + t2len)))
-      printf ("%3d -> U+%04x\n", (int)(s - t2), decodeUtf8(s));
+      printf ("%3d -> U+%04x\n", (int)(s - t2),
+              decodeUtf8(s, t2len - (s - t2)));
    
    return 0;
 }