Fixed valgrind error in Hyphenator.

2 files changed, 20 insertions, 0 deletions

diff --git a/lout/unicode.cc b/lout/unicode.cc
index 39d3a094..77bd8077 100644
--- a/lout/unicode.cc
+++ b/lout/unicode.cc
@@ -139,6 +139,22 @@ const char *nextUtf8Char (const char *s, int len)
       return r;
 }
 
+int numUtf8Chars (const char *s)
+{
+   int numUtf8 = 0;
+   for (const char *r = s; r; r = nextUtf8Char (r))
+      numUtf8++;
+   return numUtf8;
+}
+
+int numUtf8Chars (const char *s, int len)
+{
+   int numUtf8 = 0;
+   for (const char *r = s; len > 0 && r; r = nextUtf8Char (r, len))
+      numUtf8++;
+   return numUtf8;
+}
+
 } // namespace lout
 
 } // namespace unicode
diff --git a/lout/unicode.hh b/lout/unicode.hh
index cfde25e6..c74fd9b5 100644
--- a/lout/unicode.hh
+++ b/lout/unicode.hh
@@ -19,6 +19,10 @@ const char *nextUtf8Char (const char *s);
 
 const char *nextUtf8Char (const char *s, int len);
 
+int numUtf8Chars (const char *s);
+
+int numUtf8Chars (const char *s, int len);
+
 } // namespace lout
 
 } // namespace unicode