From 5b5f505ab485dd60fb608ffb2eecd755537f039f Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>

Date: Sat, 5 Oct 2013 22:47:52 -0400

Subject: [PATCH] utf8: fix utf8_is_printable

---

 src/shared/utf8.c    | 5 +++--

 src/test/test-utf8.c | 1 +

 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/shared/utf8.c b/src/shared/utf8.c

index a8e28ac..31120af 100644

--- a/src/shared/utf8.c

+++ b/src/shared/utf8.c

@@ -141,14 +141,15 @@ bool utf8_is_printable(const char* str, size_t length) {

         assert(str);

-        for (p = (const uint8_t*) str; length; p++) {

+        for (p = (const uint8_t*) str; length;) {

                 int encoded_len = utf8_encoded_valid_unichar((const char *)p);

-                int32_t val = utf8_encoded_to_unichar((const char*)p);

+                int val = utf8_encoded_to_unichar((const char*)p);

                 if (encoded_len < 0 || val < 0 || is_unicode_control(val))

                         return false;

                 length -= encoded_len;

+                p += encoded_len;

         }

         return true;

diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c

index 7bd0db1..f0182ee 100644

--- a/src/test/test-utf8.c

+++ b/src/test/test-utf8.c

@@ -26,6 +26,7 @@ static void test_utf8_is_printable(void) {

         assert_se(utf8_is_printable("ascii is valid\tunicode", 22));

         assert_se(utf8_is_printable("\342\204\242", 3));

         assert_se(!utf8_is_printable("\341\204", 2));

+        assert_se(utf8_is_printable("ąę", 4));

 }

 static void test_utf8_is_valid(void) {