commit cef42ac807f4da7ae91be1b6b81b50adb9684975
author Adrian Johnson <ajohnson@redneon.com> Sat Dec 02 14:01:42 2017 +1030
committer Albert Astals Cid <aacid@kde.org> Sat Dec 02 10:32:36 2017 +0100
tree 41a1bc98f9a7648e86f2e90752020fc245ce50e2
parent fb4c69d270a618bb23791e52f46ec73c86574294

Fix UTF test fail

The buffer size was not large enough. Increase it and add an assert to
check the buffer size.

qt5/tests/check_utf_conversion.cpp

diff --git a/qt5/tests/check_utf_conversion.cpp b/qt5/tests/check_utf_conversion.cpp
index b8eb03a..d344434 100644
--- a/qt5/tests/check_utf_conversion.cpp
+++ b/qt5/tests/check_utf_conversion.cpp
@@ -46,9 +46,9 @@
 
 void TestUTFConversion::testUTF()
 {
-    char utf8Buf[100];
+    char utf8Buf[1000];
     char *utf8String;
-    uint16_t utf16Buf[100];
+    uint16_t utf16Buf[1000];
     uint16_t *utf16String;
     int len;
 
@@ -57,8 +57,9 @@
 
     // UTF-8 to UTF-16
 
-    // QString size() returns number of code units, not code points
-    QCOMPARE( utf8CountUtf16CodeUnits(str), s.size() );
+    len = utf8CountUtf16CodeUnits(str);
+    QCOMPARE( len, s.size() ); // QString size() returns number of code units, not code points
+    Q_ASSERT( len < (int)sizeof(utf16Buf) ); // if this fails, make utf16Buf larger
 
     len = utf8ToUtf16(str, utf16Buf);
     QVERIFY( compare(utf16Buf, s.utf16()) );
@@ -70,7 +71,9 @@
 
     // UTF-16 to UTF-8
 
-    QCOMPARE( utf16CountUtf8Bytes(s.utf16()), (int)strlen(str) );
+    len = utf16CountUtf8Bytes(s.utf16());
+    QCOMPARE( len, (int)strlen(str) );
+    Q_ASSERT( len < (int)sizeof(utf8Buf) ); // if this fails, make utf8Buf larger
 
     len = utf16ToUtf8(s.utf16(), utf8Buf);
     QVERIFY( compare(utf8Buf, str) );