From 43dab2ffc899133fbd8bb4bf4d209a3bbc70b901 Mon Sep 17 00:00:00 2001 From: est31 Date: Wed, 17 Jun 2015 22:10:22 +0200 Subject: Make wrap_rows not wrap inside utf-8 multibyte sequences Also count multibyte sequences as "one" character. Adds unittest for the bug reporter's case. Fixes #2796. --- src/unittest/test_utilities.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/unittest') diff --git a/src/unittest/test_utilities.cpp b/src/unittest/test_utilities.cpp index 6a731c662..9678a81eb 100644 --- a/src/unittest/test_utilities.cpp +++ b/src/unittest/test_utilities.cpp @@ -242,6 +242,14 @@ void TestUtilities::testUTF8() void TestUtilities::testWrapRows() { UASSERT(wrap_rows("12345678",4) == "1234\n5678"); + // test that wrap_rows doesn't wrap inside multibyte sequences + const unsigned char s[] = { + 0x2f, 0x68, 0x6f, 0x6d, 0x65, 0x2f, 0x72, 0x61, 0x70, 0x74, 0x6f, + 0x72, 0x2f, 0xd1, 0x82, 0xd0, 0xb5, 0xd1, 0x81, 0xd1, 0x82, 0x2f, + 0x6d, 0x69, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x62, 0x69, + 0x6e, 0x2f, 0x2e, 0x2e, 0}; + std::string str((char *)s); + UASSERT(utf8_to_wide(wrap_rows(str, 20)) != L""); } -- cgit v1.2.3