From 246af1d40ec515fe31ef2ac3375401c3fe284157 Mon Sep 17 00:00:00 2001
From: Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>
Date: Sun, 14 Feb 2021 21:29:45 +0900
Subject: Move TGA reader from filter module into VCL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I0fea5d6e75c6bfd05ea91ed7b92aaacfcc5ec177
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111010
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
---
 .../cppunit/graphicfilter/data/tga/fail/.gitignore |   0
 .../data/tga/fail/CVE-2012-3755-1.tga              | Bin 0 -> 1440044 bytes
 .../data/tga/indeterminate/.gitignore              |   1 +
 .../cppunit/graphicfilter/data/tga/pass/.gitignore |   0
 .../graphicfilter/data/tga/pass/fdo14924-5.tga     | Bin 0 -> 2005 bytes
 .../graphicfilter/data/tga/pass/fdo14924-6.tga     | Bin 0 -> 3171 bytes
 vcl/qa/cppunit/graphicfilter/filters-tga-test.cxx  |  60 +++++++++++++++++++++
 7 files changed, 61 insertions(+)
 create mode 100644 vcl/qa/cppunit/graphicfilter/data/tga/fail/.gitignore
 create mode 100644 vcl/qa/cppunit/graphicfilter/data/tga/fail/CVE-2012-3755-1.tga
 create mode 100644 vcl/qa/cppunit/graphicfilter/data/tga/indeterminate/.gitignore
 create mode 100644 vcl/qa/cppunit/graphicfilter/data/tga/pass/.gitignore
 create mode 100644 vcl/qa/cppunit/graphicfilter/data/tga/pass/fdo14924-5.tga
 create mode 100644 vcl/qa/cppunit/graphicfilter/data/tga/pass/fdo14924-6.tga
 create mode 100644 vcl/qa/cppunit/graphicfilter/filters-tga-test.cxx

(limited to 'vcl/qa')

diff --git a/vcl/qa/cppunit/graphicfilter/data/tga/fail/.gitignore b/vcl/qa/cppunit/graphicfilter/data/tga/fail/.gitignore
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/vcl/qa/cppunit/graphicfilter/data/tga/fail/CVE-2012-3755-1.tga b/vcl/qa/cppunit/graphicfilter/data/tga/fail/CVE-2012-3755-1.tga
new file mode 100644
index 000000000000..963e5d3aedc3
Binary files /dev/null and b/vcl/qa/cppunit/graphicfilter/data/tga/fail/CVE-2012-3755-1.tga differ
diff --git a/vcl/qa/cppunit/graphicfilter/data/tga/indeterminate/.gitignore b/vcl/qa/cppunit/graphicfilter/data/tga/indeterminate/.gitignore
new file mode 100644
index 000000000000..38bf024a9b53
--- /dev/null
+++ b/vcl/qa/cppunit/graphicfilter/data/tga/indeterminate/.gitignore
@@ -0,0 +1 @@
+*.tga-*
diff --git a/vcl/qa/cppunit/graphicfilter/data/tga/pass/.gitignore b/vcl/qa/cppunit/graphicfilter/data/tga/pass/.gitignore
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/vcl/qa/cppunit/graphicfilter/data/tga/pass/fdo14924-5.tga b/vcl/qa/cppunit/graphicfilter/data/tga/pass/fdo14924-5.tga
new file mode 100644
index 000000000000..c3b38f313f82
Binary files /dev/null and b/vcl/qa/cppunit/graphicfilter/data/tga/pass/fdo14924-5.tga differ
diff --git a/vcl/qa/cppunit/graphicfilter/data/tga/pass/fdo14924-6.tga b/vcl/qa/cppunit/graphicfilter/data/tga/pass/fdo14924-6.tga
new file mode 100644
index 000000000000..92b720053702
Binary files /dev/null and b/vcl/qa/cppunit/graphicfilter/data/tga/pass/fdo14924-6.tga differ
diff --git a/vcl/qa/cppunit/graphicfilter/filters-tga-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-tga-test.cxx
new file mode 100644
index 000000000000..d0611aa56ce9
--- /dev/null
+++ b/vcl/qa/cppunit/graphicfilter/filters-tga-test.cxx
@@ -0,0 +1,60 @@
+/* -*- 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 <unotest/filters-test.hxx>
+#include <test/bootstrapfixture.hxx>
+#include <vcl/FilterConfigItem.hxx>
+#include <tools/stream.hxx>
+#include <vcl/graph.hxx>
+#include <filter/TgaReader.hxx>
+
+using namespace ::com::sun::star;
+
+/* Implementation of Filters test */
+
+class TgaFilterTest
+    : public test::FiltersTest
+    , public test::BootstrapFixture
+{
+public:
+    TgaFilterTest() : BootstrapFixture(true, false) {}
+
+    virtual bool load(const OUString &,
+        const OUString &rURL, const OUString &,
+        SfxFilterFlags, SotClipboardFormatId, unsigned int) override;
+
+    /**
+     * Ensure CVEs remain unbroken
+     */
+    void testCVEs();
+
+    CPPUNIT_TEST_SUITE(TgaFilterTest);
+    CPPUNIT_TEST(testCVEs);
+    CPPUNIT_TEST_SUITE_END();
+};
+
+bool TgaFilterTest::load(const OUString &,
+    const OUString &rURL, const OUString &,
+    SfxFilterFlags, SotClipboardFormatId, unsigned int)
+{
+    SvFileStream aFileStream(rURL, StreamMode::READ);
+    Graphic aGraphic;
+    return ImportTgaGraphic(aFileStream, aGraphic);
+}
+
+void TgaFilterTest::testCVEs()
+{
+#ifndef DISABLE_CVE_TESTS
+    testDir(OUString(), m_directories.getURLFromSrc(u"/vcl/qa/cppunit/graphicfilter/data/tga/"));
+#endif
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(TgaFilterTest);
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
cgit