|
 |
572a44 |
From 91eda57764f26d3ebdbf8194a528d8d60d0f409a Mon Sep 17 00:00:00 2001
|
|
|
572a44 |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
572a44 |
Date: Sat, 5 Oct 2013 22:47:52 -0400
|
|
|
572a44 |
Subject: [PATCH] utf8: fix utf8_is_printable
|
|
|
572a44 |
|
|
|
572a44 |
---
|
|
|
572a44 |
src/shared/utf8.c | 5 +++--
|
|
|
572a44 |
src/test/test-utf8.c | 1 +
|
|
|
572a44 |
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
572a44 |
|
|
|
572a44 |
diff --git a/src/shared/utf8.c b/src/shared/utf8.c
|
|
|
572a44 |
index a8e28ac..31120af 100644
|
|
|
572a44 |
--- a/src/shared/utf8.c
|
|
|
572a44 |
+++ b/src/shared/utf8.c
|
|
|
572a44 |
@@ -141,14 +141,15 @@ bool utf8_is_printable(const char* str, size_t length) {
|
|
|
572a44 |
|
|
|
572a44 |
assert(str);
|
|
|
572a44 |
|
|
|
572a44 |
- for (p = (const uint8_t*) str; length; p++) {
|
|
|
572a44 |
+ for (p = (const uint8_t*) str; length;) {
|
|
|
572a44 |
int encoded_len = utf8_encoded_valid_unichar((const char *)p);
|
|
|
572a44 |
- int32_t val = utf8_encoded_to_unichar((const char*)p);
|
|
|
572a44 |
+ int val = utf8_encoded_to_unichar((const char*)p);
|
|
|
572a44 |
|
|
|
572a44 |
if (encoded_len < 0 || val < 0 || is_unicode_control(val))
|
|
|
572a44 |
return false;
|
|
|
572a44 |
|
|
|
572a44 |
length -= encoded_len;
|
|
|
572a44 |
+ p += encoded_len;
|
|
|
572a44 |
}
|
|
|
572a44 |
|
|
|
572a44 |
return true;
|
|
|
572a44 |
diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c
|
|
|
572a44 |
index 7bd0db1..f0182ee 100644
|
|
|
572a44 |
--- a/src/test/test-utf8.c
|
|
|
572a44 |
+++ b/src/test/test-utf8.c
|
|
|
572a44 |
@@ -26,6 +26,7 @@ static void test_utf8_is_printable(void) {
|
|
|
572a44 |
assert_se(utf8_is_printable("ascii is valid\tunicode", 22));
|
|
|
572a44 |
assert_se(utf8_is_printable("\342\204\242", 3));
|
|
|
572a44 |
assert_se(!utf8_is_printable("\341\204", 2));
|
|
|
572a44 |
+ assert_se(utf8_is_printable("ąę", 4));
|
|
|
572a44 |
}
|
|
|
572a44 |
|
|
|
572a44 |
static void test_utf8_is_valid(void) {
|