diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2018-05-10 21:21:05 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-05-10 21:21:05 +0000 |
commit | 5e0b271b69355b5692b6afd1cd2c04d08c3b380c (patch) | |
tree | 8e7874577842b36d028198ddcda09884b8c7c93e /xfa/fgas/layout/cfx_rtfbreak_unittest.cpp | |
parent | 5ad45e2f68bb796c562302e9fc2d963c279334c7 (diff) | |
download | pdfium-5e0b271b69355b5692b6afd1cd2c04d08c3b380c.tar.xz |
Fixup ASSERT in Bidi handling; Add bidi fuzzer.
This CL converts several asserts in the FX_Bidi code to continue instead
of asserting in the face of unexpected input.
A BIDI fuzzer has been added as well.
Bug: chromium:839695
Change-Id: If61f822bde7442c008d50be58f7cecffb6e5d658
Reviewed-on: https://pdfium-review.googlesource.com/32191
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fgas/layout/cfx_rtfbreak_unittest.cpp')
-rw-r--r-- | xfa/fgas/layout/cfx_rtfbreak_unittest.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/xfa/fgas/layout/cfx_rtfbreak_unittest.cpp b/xfa/fgas/layout/cfx_rtfbreak_unittest.cpp index 5f24631315..6a0cd3f187 100644 --- a/xfa/fgas/layout/cfx_rtfbreak_unittest.cpp +++ b/xfa/fgas/layout/cfx_rtfbreak_unittest.cpp @@ -7,7 +7,10 @@ #include "xfa/fgas/layout/cfx_rtfbreak.h" #include <memory> +#include <utility> +#include "core/fxcrt/fx_bidi.h" +#include "core/fxge/cfx_font.h" #include "core/fxge/cfx_gemodule.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/test_support.h" @@ -20,7 +23,7 @@ class CFX_RTFBreakTest : public testing::Test { void SetUp() override { font_ = CFGAS_GEFont::LoadFont(L"Arial Black", 0, 0, GetGlobalFontManager()); - ASSERT(font_.Get() != nullptr); + ASSERT(font_.Get()); } std::unique_ptr<CFX_RTFBreak> CreateBreak(int32_t args) { @@ -72,3 +75,17 @@ TEST_F(CFX_RTFBreakTest, ControlCharacters) { ASSERT_EQ(1, b->CountBreakPieces()); EXPECT_EQ(L"\v", b->GetBreakPieceUnstable(0)->GetString()); } + +TEST_F(CFX_RTFBreakTest, BidiLine) { + auto rtf_break = CreateBreak(FX_LAYOUTSTYLE_ExpandTab); + rtf_break->SetLineBreakTolerance(1); + rtf_break->SetFontSize(12); + + WideString input = WideString::FromUTF8(ByteStringView("\xa\x0\xa\xa", 4)); + for (auto& ch : input) + rtf_break->AppendChar(ch); + + auto chars = rtf_break->GetCurrentLineForTesting()->m_LineChars; + FX_BidiLine(&chars, chars.size()); + EXPECT_EQ(3u, chars.size()); +} |