diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-10-05 22:47:52 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-10-05 22:59:43 -0400 |
| commit | a7176505e0083a073d03760f7b5435017a47c7c8 (patch) | |
| tree | 7a1f7ba89dfcb041540e012206bcd097d10f6603 | |
| parent | fc676b00a7545743429e0c9b12a0f0707b1059aa (diff) | |
utf8: fix utf8_is_printable
| -rw-r--r-- | src/shared/utf8.c | 5 | ||||
| -rw-r--r-- | 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 a8e28accd3..31120af046 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 7bd0db173a..f0182ee9af 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) { |