From 46782a7c1f6b363e387bb56f218cf1ea1cf764d5 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 16 Oct 2020 18:15:21 +0200 Subject: vcl pdf tokenizer: fix handling of dict -> array -> dict tokens MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Needed to be able to parse the /Reference key of signatures. (cherry picked from commit 056c1284d6a68525002c54bef10834cc135385db) Conflicts: vcl/qa/cppunit/filter/ipdf/ipdf.cxx Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105626 Tested-by: Jenkins Reviewed-by: Caolán McNamara (cherry picked from commit 8f46af565680bef0ff8ca32781e6d813a7446543) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107061 Tested-by: Michael Stahl Reviewed-by: Michael Stahl Change-Id: I6b81089a3f58a2de461ad92ca5a891c284f8686a --- vcl/CppunitTest_vcl_filter_ipdf.mk | 49 +++++++++++++++ vcl/Module_vcl.mk | 13 ++-- .../cppunit/filter/ipdf/data/dict-array-dict.pdf | 55 ++++++++++++++++ vcl/qa/cppunit/filter/ipdf/ipdf.cxx | 73 ++++++++++++++++++++++ vcl/source/filter/ipdf/pdfdocument.cxx | 13 +++- 5 files changed, 195 insertions(+), 8 deletions(-) create mode 100644 vcl/CppunitTest_vcl_filter_ipdf.mk create mode 100644 vcl/qa/cppunit/filter/ipdf/data/dict-array-dict.pdf create mode 100644 vcl/qa/cppunit/filter/ipdf/ipdf.cxx diff --git a/vcl/CppunitTest_vcl_filter_ipdf.mk b/vcl/CppunitTest_vcl_filter_ipdf.mk new file mode 100644 index 000000000000..403836ac781a --- /dev/null +++ b/vcl/CppunitTest_vcl_filter_ipdf.mk @@ -0,0 +1,49 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call gb_CppunitTest_CppunitTest,vcl_filter_ipdf)) + +$(eval $(call gb_CppunitTest_use_externals,vcl_filter_ipdf,\ + boost_headers \ + pdfium \ +)) + +$(eval $(call gb_CppunitTest_add_exception_objects,vcl_filter_ipdf, \ + vcl/qa/cppunit/filter/ipdf/ipdf \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,vcl_filter_ipdf, \ + comphelper \ + cppu \ + sal \ + sfx \ + svx \ + test \ + tl \ + unotest \ + utl \ + vcl \ +)) + +$(eval $(call gb_CppunitTest_use_sdk_api,vcl_filter_ipdf)) + +$(eval $(call gb_CppunitTest_use_ure,vcl_filter_ipdf)) +$(eval $(call gb_CppunitTest_use_vcl,vcl_filter_ipdf)) + +$(eval $(call gb_CppunitTest_use_rdb,vcl_filter_ipdf,services)) + +$(eval $(call gb_CppunitTest_use_custom_headers,vcl_filter_ipdf,\ + officecfg/registry \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,vcl_filter_ipdf)) + +# vim: set noet sw=4 ts=4: diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 78604ab0e9c4..6ebfaa7cf7cf 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -212,12 +212,6 @@ $(eval $(call gb_Module_add_check_targets,vcl,\ CppunitTest_vcl_backend_test \ )) -ifneq (,$(filter PDFIUM,$(BUILD_TYPE))) -$(eval $(call gb_Module_add_check_targets,vcl,\ - CppunitTest_vcl_pdfexport \ -)) -endif - ifeq ($(USING_X11),TRUE) $(eval $(call gb_Module_add_check_targets,vcl,\ CppunitTest_vcl_timer \ @@ -255,4 +249,11 @@ $(eval $(call gb_Module_add_slowcheck_targets,vcl,\ )) endif +ifneq (,$(filter PDFIUM,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_slowcheck_targets,vcl,\ + CppunitTest_vcl_pdfexport \ + CppunitTest_vcl_filter_ipdf \ +)) +endif + # vim: set noet sw=4 ts=4: diff --git a/vcl/qa/cppunit/filter/ipdf/data/dict-array-dict.pdf b/vcl/qa/cppunit/filter/ipdf/data/dict-array-dict.pdf new file mode 100644 index 000000000000..73de3117b9a6 --- /dev/null +++ b/vcl/qa/cppunit/filter/ipdf/data/dict-array-dict.pdf @@ -0,0 +1,55 @@ +%PDF-1.7 +% ò¤ô +1 0 obj << + /Type /Catalog + /Pages 2 0 R +>> +endobj +2 0 obj << + /Type /Pages + /MediaBox [0 0 200 300] + /Count 1 + /Kids [3 0 R] +>> +endobj +3 0 obj << + /Type /Page + /Parent 2 0 R + /Contents 4 0 R + /Key[<>] +>> +endobj +4 0 obj << + /Length 188 +>> +stream +q +0 0 0 rg +0 290 10 10 re B* +10 150 50 30 re B* +0 0 1 rg +190 290 10 10 re B* +70 232 50 30 re B* +0 1 0 rg +190 0 10 10 re B* +130 150 50 30 re B* +1 0 0 rg +0 0 10 10 re B* +70 67 50 30 re B* +Q +endstream +endobj +xref +0 5 +0000000000 65535 f +0000000015 00000 n +0000000068 00000 n +0000000157 00000 n +0000000251 00000 n +trailer << + /Root 1 0 R + /Size 5 +>> +startxref +491 +%%EOF diff --git a/vcl/qa/cppunit/filter/ipdf/ipdf.cxx b/vcl/qa/cppunit/filter/ipdf/ipdf.cxx new file mode 100644 index 000000000000..037d4427dbbf --- /dev/null +++ b/vcl/qa/cppunit/filter/ipdf/ipdf.cxx @@ -0,0 +1,73 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +using namespace ::com::sun::star; + +namespace +{ +char const DATA_DIRECTORY[] = "/vcl/qa/cppunit/filter/ipdf/data/"; +} + +/// Covers vcl/source/filter/ipdf/ fixes. +class VclFilterIpdfTest : public test::BootstrapFixture, public unotest::MacrosTest +{ +public: + void setUp() override; +}; + +void VclFilterIpdfTest::setUp() +{ + test::BootstrapFixture::setUp(); + + mxDesktop.set(frame::Desktop::create(m_xContext)); +} + +CPPUNIT_TEST_FIXTURE(VclFilterIpdfTest, testDictArrayDict) +{ + // Load a file that has markup like this: + // 3 0 obj << + // /Key[<>] + // >> + OUString aSourceURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "dict-array-dict.pdf"; + SvFileStream aFile(aSourceURL, StreamMode::READ); + vcl::filter::PDFDocument aDocument; + CPPUNIT_ASSERT(aDocument.Read(aFile)); + std::vector aPages = aDocument.GetPages(); + CPPUNIT_ASSERT(!aPages.empty()); + vcl::filter::PDFObjectElement* pPage = aPages[0]; + auto pKey = dynamic_cast(pPage->Lookup("Key")); + + // Without the accompanying fix in place, this test would have failed, because the value of Key + // was a dictionary element, not an array element. + CPPUNIT_ASSERT(pKey); +} + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/filter/ipdf/pdfdocument.cxx b/vcl/source/filter/ipdf/pdfdocument.cxx index e12db4148a7d..41f80316ea67 100644 --- a/vcl/source/filter/ipdf/pdfdocument.cxx +++ b/vcl/source/filter/ipdf/pdfdocument.cxx @@ -2217,8 +2217,17 @@ size_t PDFDictionaryElement::Parse(const std::vector if (nexti >= i) // ensure we go forwards and not endlessly loop { i = nexti; - rDictionary[aName] = pDictionary; - aName.clear(); + if (pArray) + { + // Dictionary value inside an array. + pArray->PushBack(pDictionary); + } + else + { + // Dictionary toplevel value. + rDictionary[aName] = pDictionary; + aName.clear(); + } } } } -- cgit v1.2.3