diff options
| author | tobias <tobias.schulz@hotmail.com> | 2021-06-11 05:48:17 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-06-14 11:23:32 +0200 |
| commit | 62503c3acde8eab0ca198f66519270761f64d56d (patch) | |
| tree | d499c6e215621565f3d5e29d6a35608d24056686 /sw/qa | |
| parent | 343d4d32f00053bd72cfe240125835fe25ce264f (diff) | |
tdf#142669 Assert data alignment in unit test
The alignment of a pointer size was not checked in unit test
txtexport.cxx. This could have caused errors in future test cases.
Change-Id: If0af5c75a9fc5c757cab6ac900b685d3c70fca8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117026
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/txtexport/txtexport.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sw/qa/extras/txtexport/txtexport.cxx b/sw/qa/extras/txtexport/txtexport.cxx index 0e52f51a4e34..54f623700fb0 100644 --- a/sw/qa/extras/txtexport/txtexport.cxx +++ b/sw/qa/extras/txtexport/txtexport.cxx @@ -26,7 +26,9 @@ protected: SvFileStream aStream(maTempFile.GetURL(), StreamMode::READ); aStream.ReadStream(aMemoryStream); const T* pData = static_cast<const T*>(aMemoryStream.GetData()); - return std::vector<T>(pData, pData + aMemoryStream.GetSize()); + sal_uInt64 size = aMemoryStream.GetSize(); + CPPUNIT_ASSERT_EQUAL(sal_uInt64(0), size % sizeof(T)); + return std::vector<T>(pData, pData + size / sizeof(T)); } OString readExportedFile() @@ -80,7 +82,7 @@ DECLARE_TXTEXPORT_TEST(testTdf120574_utf8bom, "UTF8BOMCRLF.txt") DECLARE_TXTEXPORT_TEST(testTdf120574_utf16lebom, "UTF16LEBOMCRLF.txt") { std::vector<sal_Unicode> aMemStream = readMemoryStream<sal_Unicode>(); - OUString aData(aMemStream.data(), aMemStream.size() / sizeof(sal_Unicode)); + OUString aData(aMemStream.data(), aMemStream.size()); CPPUNIT_ASSERT_EQUAL(OUString(u"\uFEFFフー\r\nバー\r\n"), aData); } @@ -94,7 +96,7 @@ DECLARE_TXTEXPORT_TEST(testTdf142669_utf8, "UTF8CRLF.txt") DECLARE_TXTEXPORT_TEST(testTdf142669_utf16le, "UTF16LECRLF.txt") { std::vector<sal_Unicode> aMemStream = readMemoryStream<sal_Unicode>(); - OUString aData(aMemStream.data(), aMemStream.size() / sizeof(sal_Unicode)); + OUString aData(aMemStream.data(), aMemStream.size()); CPPUNIT_ASSERT_EQUAL(OUString(u"フー\r\nバー\r\n"), aData); } |